external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

update utest

Browse source
This commit is contained in:
winlin 2016-09-15 14:47:42 +08:00
parent 0fb71281a9
commit b5d466f3d2
4 changed files with 15 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

1
trunk/src/app/srs_app_config.hpp
View file

@ -344,6 +344,7 @@ private:
* if reload, reload the config file. * if reload, reload the config file.
*/ */
std::string config_file; std::string config_file;
protected:
/** /**
* the directive root. * the directive root.
*/ */

5
trunk/src/utest/srs_utest_config.cpp
View file

@ -73,6 +73,11 @@ int MockSrsConfig::parse(string buf)
return ret; return ret;
} }
if ((ret = srs_config_transform_vhost(root)) != ERROR_SUCCESS) {
srs_error("transform config failed. ret=%d", ret);
return ret;
}
return check_config(); return check_config();
} }

25
trunk/src/utest/srs_utest_reload.cpp
View file

@ -52,10 +52,7 @@ void MockReloadHandler::reset()
vhost_http_updated_reloaded = false; vhost_http_updated_reloaded = false;
vhost_added_reloaded = false; vhost_added_reloaded = false;
vhost_removed_reloaded = false; vhost_removed_reloaded = false;
vhost_atc_reloaded = false; vhost_play_reloaded = false;
vhost_gop_cache_reloaded = false;
vhost_queue_length_reloaded = false;
vhost_time_jitter_reloaded = false;
vhost_forward_reloaded = false; vhost_forward_reloaded = false;
vhost_hls_reloaded = false; vhost_hls_reloaded = false;
vhost_dvr_reloaded = false; vhost_dvr_reloaded = false;
@ -88,10 +85,7 @@ int MockReloadHandler::count_true()
if (vhost_http_updated_reloaded) count_true++; if (vhost_http_updated_reloaded) count_true++;
if (vhost_added_reloaded) count_true++; if (vhost_added_reloaded) count_true++;
if (vhost_removed_reloaded) count_true++; if (vhost_removed_reloaded) count_true++;
if (vhost_atc_reloaded) count_true++; if (vhost_play_reloaded) count_true++;
if (vhost_gop_cache_reloaded) count_true++;
if (vhost_queue_length_reloaded) count_true++;
if (vhost_time_jitter_reloaded) count_true++;
if (vhost_forward_reloaded) count_true++; if (vhost_forward_reloaded) count_true++;
if (vhost_hls_reloaded) count_true++; if (vhost_hls_reloaded) count_true++;
if (vhost_dvr_reloaded) count_true++; if (vhost_dvr_reloaded) count_true++;
@ -121,10 +115,7 @@ int MockReloadHandler::count_false()
if (!vhost_http_updated_reloaded) count_false++; if (!vhost_http_updated_reloaded) count_false++;
if (!vhost_added_reloaded) count_false++; if (!vhost_added_reloaded) count_false++;
if (!vhost_removed_reloaded) count_false++; if (!vhost_removed_reloaded) count_false++;
if (!vhost_atc_reloaded) count_false++; if (!vhost_play_reloaded) count_false++;
if (!vhost_gop_cache_reloaded) count_false++;
if (!vhost_queue_length_reloaded) count_false++;
if (!vhost_time_jitter_reloaded) count_false++;
if (!vhost_forward_reloaded) count_false++; if (!vhost_forward_reloaded) count_false++;
if (!vhost_hls_reloaded) count_false++; if (!vhost_hls_reloaded) count_false++;
if (!vhost_dvr_reloaded) count_false++; if (!vhost_dvr_reloaded) count_false++;
@ -232,7 +223,7 @@ int MockReloadHandler::on_reload_vhost_removed(string /*vhost*/)
int MockReloadHandler::on_reload_vhost_play(string /*vhost*/) int MockReloadHandler::on_reload_vhost_play(string /*vhost*/)
{ {
vhost_time_jitter_reloaded = true; vhost_play_reloaded = true;
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
@ -664,7 +655,7 @@ VOID TEST(ConfigReloadTest, ReloadVhostAtc)
handler.reset(); handler.reset();
EXPECT_TRUE(ERROR_SUCCESS == conf.do_reload(_MIN_OK_CONF"vhost a{atc on;}")); EXPECT_TRUE(ERROR_SUCCESS == conf.do_reload(_MIN_OK_CONF"vhost a{atc on;}"));
EXPECT_TRUE(handler.vhost_atc_reloaded); EXPECT_TRUE(handler.vhost_play_reloaded);
EXPECT_EQ(1, handler.count_true()); EXPECT_EQ(1, handler.count_true());
handler.reset(); handler.reset();
@ -685,7 +676,7 @@ VOID TEST(ConfigReloadTest, ReloadVhostGopCache)
handler.reset(); handler.reset();
EXPECT_TRUE(ERROR_SUCCESS == conf.do_reload(_MIN_OK_CONF"vhost a{gop_cache on;}")); EXPECT_TRUE(ERROR_SUCCESS == conf.do_reload(_MIN_OK_CONF"vhost a{gop_cache on;}"));
EXPECT_TRUE(handler.vhost_gop_cache_reloaded); EXPECT_TRUE(handler.vhost_play_reloaded);
EXPECT_EQ(1, handler.count_true()); EXPECT_EQ(1, handler.count_true());
handler.reset(); handler.reset();
@ -706,7 +697,7 @@ VOID TEST(ConfigReloadTest, ReloadVhostQueueLength)
handler.reset(); handler.reset();
EXPECT_TRUE(ERROR_SUCCESS == conf.do_reload(_MIN_OK_CONF"vhost a{queue_length 20;}")); EXPECT_TRUE(ERROR_SUCCESS == conf.do_reload(_MIN_OK_CONF"vhost a{queue_length 20;}"));
EXPECT_TRUE(handler.vhost_queue_length_reloaded); EXPECT_TRUE(handler.vhost_play_reloaded);
EXPECT_EQ(1, handler.count_true()); EXPECT_EQ(1, handler.count_true());
handler.reset(); handler.reset();
@ -727,7 +718,7 @@ VOID TEST(ConfigReloadTest, ReloadVhostTimeJitter)
handler.reset(); handler.reset();
EXPECT_TRUE(ERROR_SUCCESS == conf.do_reload(_MIN_OK_CONF"vhost a{time_jitter zero;}")); EXPECT_TRUE(ERROR_SUCCESS == conf.do_reload(_MIN_OK_CONF"vhost a{time_jitter zero;}"));
EXPECT_TRUE(handler.vhost_time_jitter_reloaded); EXPECT_TRUE(handler.vhost_play_reloaded);
EXPECT_EQ(1, handler.count_true()); EXPECT_EQ(1, handler.count_true());
handler.reset(); handler.reset();

5
trunk/src/utest/srs_utest_reload.hpp
View file

@ -49,10 +49,7 @@ public:
bool vhost_http_updated_reloaded; bool vhost_http_updated_reloaded;
bool vhost_added_reloaded; bool vhost_added_reloaded;
bool vhost_removed_reloaded; bool vhost_removed_reloaded;
bool vhost_atc_reloaded; bool vhost_play_reloaded;
bool vhost_gop_cache_reloaded;
bool vhost_queue_length_reloaded;
bool vhost_time_jitter_reloaded;
bool vhost_forward_reloaded; bool vhost_forward_reloaded;
bool vhost_hls_reloaded; bool vhost_hls_reloaded;
bool vhost_dvr_reloaded; bool vhost_dvr_reloaded;