diff options
| -rw-r--r-- | qtip/run.py (renamed from qtip/qtip.py) | 2 | ||||
| -rw-r--r-- | tests/unit/api/qtip_server_test.py | 2 | ||||
| -rw-r--r-- | tests/unit/utils/args_handler_test.py | 2 | ||||
| -rw-r--r-- | tests/unit/utils/create_zones_test.py | 1 | ||||
| -rw-r--r-- | tests/unit/utils/env_setup_test.py | 2 | ||||
| -rw-r--r-- | tests/unit/utils/spawn_vm_test.py | 1 | ||||
| -rw-r--r-- | tox.ini | 2 |
7 files changed, 4 insertions, 8 deletions
diff --git a/qtip/qtip.py b/qtip/run.py index 66ff674f..a2c26eda 100644 --- a/qtip/qtip.py +++ b/qtip/run.py @@ -7,7 +7,7 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -from qtip.utils.cli import Cli +from utils.cli import Cli def main(): diff --git a/tests/unit/api/qtip_server_test.py b/tests/unit/api/qtip_server_test.py index 3e92fcb8..96544c95 100644 --- a/tests/unit/api/qtip_server_test.py +++ b/tests/unit/api/qtip_server_test.py @@ -25,7 +25,6 @@ def side_effect_pass(): class TestClass: - @pytest.mark.skip(reason="(yujunz) to be fixed") @pytest.mark.parametrize("body, expected", [ ({'installer_type': 'fuel', 'installer_ip': '10.20.0.2'}, @@ -100,7 +99,6 @@ class TestClass: delete_reply = app_client.delete("/api/v1.0/jobs/%s" % id) assert "successful" in delete_reply.data - @pytest.mark.skip(reason="(yujunz) to be fixed") @pytest.mark.parametrize("body, expected", [ ([{'installer_type': 'fuel', 'installer_ip': '10.20.0.2'}, diff --git a/tests/unit/utils/args_handler_test.py b/tests/unit/utils/args_handler_test.py index 29347154..5cbe766e 100644 --- a/tests/unit/utils/args_handler_test.py +++ b/tests/unit/utils/args_handler_test.py @@ -12,7 +12,7 @@ import qtip.utils.args_handler class TestClass: - @pytest.mark.skip(reason="(yujunz) to be fixed") + @pytest.mark.skip("(yujunz) test fails") @pytest.mark.parametrize("test_input, expected", [ (['fuel', '/home', 'benchmarks/testplan/default/network/iperf_bm.yaml'], ['fuel', '/home', "iperf", diff --git a/tests/unit/utils/create_zones_test.py b/tests/unit/utils/create_zones_test.py index 48f6c10e..8b1e97cc 100644 --- a/tests/unit/utils/create_zones_test.py +++ b/tests/unit/utils/create_zones_test.py @@ -51,7 +51,6 @@ class NovaMock(MagicMock): class TestClass: - @pytest.mark.skip(reason="(yujunz) to be fixed") @pytest.mark.parametrize("test_input, expected", [ (['compute1', 'compute2'], ['create:compute1:compute1', diff --git a/tests/unit/utils/env_setup_test.py b/tests/unit/utils/env_setup_test.py index 5aa21b1b..c40801cc 100644 --- a/tests/unit/utils/env_setup_test.py +++ b/tests/unit/utils/env_setup_test.py @@ -78,7 +78,7 @@ class TestClass: result = filecmp.cmp(get_output("hosts"), "config/hosts") assert result - @pytest.mark.skip(reason="(yujunz) test halt, to be fixed") + @pytest.mark.skip("(yujunz) to be fixed") def test_ping(self, capfd): test_class = Env_setup() mock_ips = mock.Mock(return_value=["127.0.0.1", "10.20.0.29"]) diff --git a/tests/unit/utils/spawn_vm_test.py b/tests/unit/utils/spawn_vm_test.py index 35273467..ba237378 100644 --- a/tests/unit/utils/spawn_vm_test.py +++ b/tests/unit/utils/spawn_vm_test.py @@ -32,7 +32,6 @@ class HeatMock(MagicMock): class TestClass: - @pytest.mark.skip(reason="(yujunz) to be fixed") @pytest.mark.parametrize("test_input, expected", [ ({'availability_zone': ['compute1', 'compute1'], 'OS_image': ['QTIP_CentOS', 'QTIP_CentOS'], @@ -4,7 +4,7 @@ # and then run "tox" from this directory. [tox] -envlist = py27,pep8 +envlist = py27 skipsdist = True [testenv] |