cmhi
/
ztp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mod aaa-12 1. 合并冲突文件 

SOL：
修改人：huangxin
检视人：huangxin
This commit is contained in:
huangxin 2019-12-12 10:34:39 +08:00
parent 28c0be4535
commit 7f4193e697
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
unit_test/test/configure_test.cpp
View File

@ -21,18 +21,6 @@ TEST(config_file_test, load_ztpConfig)
ASSERT_STREQ(pZtpCfg->svr_cfg.server_url, "cmhi.ztp.com"); ASSERT_STREQ(pZtpCfg->svr_cfg.server_url, "cmhi.ztp.com");
ASSERT_EQ(10082, pZtpCfg->svr_cfg.port); ASSERT_EQ(10082, pZtpCfg->svr_cfg.port);
<<<<<<< HEAD
=======
}
TEST(config_file_test, load_devConfig)
{
int ret = init_configure("../../ztp.conf");
ASSERT_EQ(ERR_OK, ret);
ret = load_dev_config("ace08484843");
ASSERT_EQ(ERR_OK, ret);
>>>>>>> ad92219248b9550b28ffe8c757d237cc61065513
PDEVICE_CONFIG pDevCfg = get_device_configure(); PDEVICE_CONFIG pDevCfg = get_device_configure();