From aa6e0b06aa404557bfe653746bc7c3f62a81f705 Mon Sep 17 00:00:00 2001
From: xudan <xudan16@huawei.com>
Date: Mon, 5 Dec 2016 08:28:20 +0000
Subject: dovetail tool: add unit test into script unittest.sh

1. Since JIRA: DOVETAIL-55 has been merged, unit tests can't pass without
   load_config_files().
2. Fix the bug by adding load_config_files().
3. Add run_tests() into script unittest.sh to include all unit tests in
   tests/unit.

JIRA: DOVETAIL-149

Change-Id: I7bdb0732fefde3a3f3b82441b4cc7e46ece66a1e
Signed-off-by: xudan <xudan16@huawei.com>
---
 dovetail/tests/unit/test_parser.py |  5 +++--
 unittests/unittest.sh              | 22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/dovetail/tests/unit/test_parser.py b/dovetail/tests/unit/test_parser.py
index b4331ea1..2183bd60 100644
--- a/dovetail/tests/unit/test_parser.py
+++ b/dovetail/tests/unit/test_parser.py
@@ -14,7 +14,6 @@ Test 'parser' module
 import logging
 import os
 import unittest
-
 import yaml
 
 import parser as dovetail_parser
@@ -26,8 +25,10 @@ class TestParser(unittest.TestCase):
 
     def setUp(self):
         """Test case setup"""
-        logging.disable(logging.CRITICAL)
+        from conf.dovetail_config import DovetailConfig as dt_config
+        dt_config.load_config_files()
         dovetail_parser.Parser.create_log()
+        logging.disable(logging.CRITICAL)
 
     def test_parser_cmd(self):
         """Test whether the command is correctly parsed."""
diff --git a/unittests/unittest.sh b/unittests/unittest.sh
index 1560a90d..215d0ebd 100755
--- a/unittests/unittest.sh
+++ b/unittests/unittest.sh
@@ -35,4 +35,26 @@ run_flake8() {
     fi
 }
 
+run_tests() {
+    echo "Running unittest ..."
+    cd dovetail/
+    if [ $FILE_OPTION == "f" ]; then
+        python -m unittest discover -v -s tests/unit > $logfile 2>&1
+    else
+        python -m unittest discover -v -s tests/unit
+    fi
+
+    if [ $? -ne 0 ]; then
+        if [ $FILE_OPTION == "f" ]; then
+            echo "FAILED, results in $logfile"
+        fi
+        exit 1
+    else
+        if [ $FILE_OPTION == "f" ]; then
+            echo "OK, results in $logfile"
+        fi
+    fi
+}
+
 run_flake8
+run_tests
-- 
cgit