From 1124a453feb24308f58bda363c229f632cafd82f Mon Sep 17 00:00:00 2001 From: MatthewLi Date: Tue, 20 Dec 2016 05:20:08 -0500 Subject: dovetail tool: fully tox supported JIRA: DOVETAIL-165 1, fully tox supported 2, previous easy setup abandoned 3, CI verify job changed accordingly 4, unittest bug fix this should merge after https://gerrit.opnfv.org/gerrit/#/c/26297/ results see https://etherpad.opnfv.org/p/dovetail_report Change-Id: I52ce3999fcde7e817854e4a39f4111eef081bc78 Signed-off-by: MatthewLi --- dovetail/tests/unit/test_parser.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'dovetail/tests/unit') diff --git a/dovetail/tests/unit/test_parser.py b/dovetail/tests/unit/test_parser.py index 73ed2b72..5fb4dbb9 100644 --- a/dovetail/tests/unit/test_parser.py +++ b/dovetail/tests/unit/test_parser.py @@ -16,7 +16,8 @@ import os import unittest import yaml -import parser as dovetail_parser +from dovetail import parser +from dovetail.utils.dovetail_config import DovetailConfig as dt_cfg class TestParser(unittest.TestCase): @@ -25,9 +26,8 @@ class TestParser(unittest.TestCase): def setUp(self): """Test case setup""" - from utils.dovetail_config import DovetailConfig as dt_cfg dt_cfg.load_config_files() - dovetail_parser.Parser.create_log() + parser.Parser.create_log() logging.disable(logging.CRITICAL) def test_parser_cmd(self): @@ -39,7 +39,7 @@ class TestParser(unittest.TestCase): MockTestcase = type('Testcase', (object,), {}) mock_testcase = MockTestcase() mock_testcase.testcase = mock_testcase_yaml.values()[0] - output = dovetail_parser.Parser.parse_cmd(mock_cmd, mock_testcase) + output = parser.Parser.parse_cmd(mock_cmd, mock_testcase) expected_output = ("python /functest/ci/run_tests.py -t " "tempest_smoke_serial -r") self.assertEqual(expected_output, output) @@ -52,7 +52,7 @@ class TestParser(unittest.TestCase): MockTestcase = type('Testcase', (object,), {}) mock_testcase = MockTestcase() mock_testcase.testcase = mock_testcase_yaml.values() - output = dovetail_parser.Parser.parse_cmd(mock_cmd, mock_testcase) + output = parser.Parser.parse_cmd(mock_cmd, mock_testcase) expected_output = ("python /functest/ci/run_tests.py -t " "None -r") self.assertEqual(expected_output, output) -- cgit 1.2.3-korg