openstack/tempest
Code Issues Proposed changes

Merge "Fix unit test that break isolation"

Browse Source
This commit is contained in:
Jenkins 2017-08-21 19:43:47 +00:00 committed by Gerrit Code Review
commit ac9500a457
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tempest/tests/test_base_test.py
View File

@ -13,10 +13,10 @@
# under the License.
import mock
from oslo_config import cfg
from tempest import clients
from tempest.common import credentials_factory as credentials
from tempest import config
from tempest.lib.common import fixed_network
from tempest import test
from tempest.tests import base
@ -28,8 +28,9 @@ class TestBaseTestCase(base.TestCase):
super(TestBaseTestCase, self).setUp()
self.useFixture(fake_config.ConfigFixture())
self.fixed_network_name = 'fixed-net'
config.CONF.compute.fixed_network_name = self.fixed_network_name
config.CONF.service_available.neutron = True
cfg.CONF.set_default('fixed_network_name', self.fixed_network_name,
'compute')
cfg.CONF.set_default('neutron', True, 'service_available')
@mock.patch.object(test.BaseTestCase, 'get_client_manager')
@mock.patch.object(test.BaseTestCase, '_get_credentials_provider')
@ -56,7 +57,7 @@ class TestBaseTestCase(base.TestCase):
def test_get_tenant_network_with_nova_net(self, mock_man, mock_iaa,
mock_giv, mock_gtn, mock_gcp,
mock_gcm):
config.CONF.service_available.neutron = False
cfg.CONF.set_default('neutron', False, 'service_available')
mock_prov = mock.Mock()
mock_admin_man = mock.Mock()
mock_iaa.return_value = True