diff options
Diffstat (limited to 'neutronclient/tests')
-rw-r--r-- | neutronclient/tests/functional/core/test_readonly_neutron.py | 2 | ||||
-rw-r--r-- | neutronclient/tests/unit/test_command_meta.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/neutronclient/tests/functional/core/test_readonly_neutron.py b/neutronclient/tests/functional/core/test_readonly_neutron.py index 4fe9897..41ee524 100644 --- a/neutronclient/tests/functional/core/test_readonly_neutron.py +++ b/neutronclient/tests/functional/core/test_readonly_neutron.py @@ -13,6 +13,7 @@ import re from tempest.lib import exceptions +import testtools from neutronclient.tests.functional import base @@ -51,6 +52,7 @@ class SimpleReadOnlyNeutronClientTest(base.ClientTestBase): ext = self.parser.listing(self.neutron('ext-list')) self.assertTableStruct(ext, ['alias', 'name']) + @testtools.skip('Skipped until ML2/OVS is enabled') def test_neutron_dhcp_agent_list_hosting_net(self): self.neutron('dhcp-agent-list-hosting-net', params='private') diff --git a/neutronclient/tests/unit/test_command_meta.py b/neutronclient/tests/unit/test_command_meta.py index 184f366..dedc3dd 100644 --- a/neutronclient/tests/unit/test_command_meta.py +++ b/neutronclient/tests/unit/test_command_meta.py @@ -20,7 +20,6 @@ import logging import testtools -from testtools import helpers from neutronclient.neutron import v2_0 as neutronV20 @@ -30,7 +29,7 @@ class TestCommandMeta(testtools.TestCase): class FakeCommand(neutronV20.NeutronCommand): pass - self.assertTrue(helpers.safe_hasattr(FakeCommand, 'log')) + self.assertTrue(hasattr(FakeCommand, 'log')) self.assertIsInstance(FakeCommand.log, logging.getLoggerClass()) self.assertEqual(__name__ + ".FakeCommand", FakeCommand.log.name) @@ -38,5 +37,5 @@ class TestCommandMeta(testtools.TestCase): class FakeCommand(neutronV20.NeutronCommand): log = None - self.assertTrue(helpers.safe_hasattr(FakeCommand, 'log')) + self.assertTrue(hasattr(FakeCommand, 'log')) self.assertIsNone(FakeCommand.log) |