From 776de3827e63b4771d433b817c1ffe4f0ee9e09f Mon Sep 17 00:00:00 2001
From: huangxin <huangxin@cmhi.chinamobile.com>
Date: Thu, 12 Dec 2019 10:33:04 +0800
Subject: [PATCH] =?UTF-8?q?Mod=20=20aaa-12=201.=20=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81=E6=96=87=E4=BB=B6=20SOL=EF=BC=9A=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BA=BA=EF=BC=9Ahuangxin=20=E6=A3=80=E8=A7=86?=
 =?UTF-8?q?=E4=BA=BA=EF=BC=9Ahuangxin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 unit_test/test/configure_test.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/unit_test/test/configure_test.cpp b/unit_test/test/configure_test.cpp
index 7220325..029a3af 100644
--- a/unit_test/test/configure_test.cpp
+++ b/unit_test/test/configure_test.cpp
@@ -21,6 +21,18 @@ TEST(config_file_test, load_ztpConfig)
 
     ASSERT_STREQ(pZtpCfg->svr_cfg.server_url, "cmhi.ztp.com");
     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();