winlin

pass all utest for 2.0

@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
31 // current release version 31 // current release version
32 #define VERSION_MAJOR 2 32 #define VERSION_MAJOR 2
33 #define VERSION_MINOR 0 33 #define VERSION_MINOR 0
34 -#define VERSION_REVISION 129 34 +#define VERSION_REVISION 130
35 35
36 // server info. 36 // server info.
37 #define RTMP_SIG_SRS_KEY "SRS" 37 #define RTMP_SIG_SRS_KEY "SRS"
@@ -460,17 +460,17 @@ VOID TEST(ConfigReloadTest, ReloadPithyPrint) @@ -460,17 +460,17 @@ VOID TEST(ConfigReloadTest, ReloadPithyPrint)
460 MockSrsReloadConfig conf; 460 MockSrsReloadConfig conf;
461 461
462 conf.subscribe(&handler); 462 conf.subscribe(&handler);
463 - EXPECT_TRUE(ERROR_SUCCESS == conf.parse(_MIN_OK_CONF"pithy_print {publish 1000;}"));  
464 - EXPECT_TRUE(ERROR_SUCCESS == conf.reload(_MIN_OK_CONF"pithy_print {publish 1000;}")); 463 + EXPECT_TRUE(ERROR_SUCCESS == conf.parse(_MIN_OK_CONF"pithy_print_ms 1000;"));
  464 + EXPECT_TRUE(ERROR_SUCCESS == conf.reload(_MIN_OK_CONF"pithy_print_ms 1000;"));
465 EXPECT_TRUE(handler.all_false()); 465 EXPECT_TRUE(handler.all_false());
466 handler.reset(); 466 handler.reset();
467 467
468 - EXPECT_TRUE(ERROR_SUCCESS == conf.reload(_MIN_OK_CONF"pithy_print {publish 2000;}")); 468 + EXPECT_TRUE(ERROR_SUCCESS == conf.reload(_MIN_OK_CONF"pithy_print_ms 2000;"));
469 EXPECT_TRUE(handler.pithy_print_reloaded); 469 EXPECT_TRUE(handler.pithy_print_reloaded);
470 EXPECT_EQ(1, handler.count_true()); 470 EXPECT_EQ(1, handler.count_true());
471 handler.reset(); 471 handler.reset();
472 472
473 - EXPECT_TRUE(ERROR_SUCCESS == conf.reload(_MIN_OK_CONF"pithy_print {publish 1000;}")); 473 + EXPECT_TRUE(ERROR_SUCCESS == conf.reload(_MIN_OK_CONF"pithy_print_ms 1000;"));
474 EXPECT_EQ(1, handler.count_true()); 474 EXPECT_EQ(1, handler.count_true());
475 handler.reset(); 475 handler.reset();
476 } 476 }