Fix neutron cli tests skip for testr
The manner in which a skip exception was raised in the neutron cli
tests would cause the tests to be listed as fail when run with testr.
This commit corrects the behavior so that testr will correctly mark
the test as skipped instead of failed.
Change-Id: I9680b6946b44eeab9a0e6c5b9b4609e702880f07
diff --git a/tempest/cli/simple_read_only/test_neutron.py b/tempest/cli/simple_read_only/test_neutron.py
index 3b93696..83cf985 100644
--- a/tempest/cli/simple_read_only/test_neutron.py
+++ b/tempest/cli/simple_read_only/test_neutron.py
@@ -19,7 +19,6 @@
import subprocess
from oslo.config import cfg
-import testtools
import tempest.cli
from tempest.common import log as logging
@@ -36,9 +35,13 @@
These tests do not presume any content, nor do they create
their own. They only verify the structure of output if present.
"""
- if (not CONF.service_available.neutron):
- msg = "Skiping all Neutron cli tests because it is not available"
- raise testtools.TestCase.skipException(msg)
+
+ @classmethod
+ def setUpClass(cls):
+ if (not CONF.service_available.neutron):
+ msg = "Skiping all Neutron cli tests because it is not available"
+ raise cls.skipException(msg)
+ super(SimpleReadOnlyNeutronClientTest, cls).setUpClass()
def test_neutron_fake_action(self):
self.assertRaises(subprocess.CalledProcessError,