openstack/cinder
Code Issues Proposed changes

Stop using /etc/cinder/cinder.conf for cmd tests

Browse Source 
test_cmd tests were using were using /etc/cinder/cinder.conf which means
that when we run the tests in a system where a cinder configuration
exists we could end up with problems since the base class setup of
configuration would get overwritten in those tests.

This patch removes the use of /etc/cinder/cinder.conf in test_cmd tests.

Change-Id: Ifb0297f7f1daf0bb0f90b88890f0bf8d5cb5f744
Closes-Bug: #1617330
This commit is contained in:
Gorka Eguileor
2016-08-26 16:49:51 +02:00
parent 4d03eccb67
commit c517048ced
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cinder/tests/unit/test_cmd.py
View File

@@ -55,7 +55,6 @@ class TestCinderApiCmd(test.TestCase):
def setUp(self):
super(TestCinderApiCmd, self).setUp()
sys.argv = ['cinder-api']
CONF(sys.argv[1:], project='cinder', version=version.version_string())
def tearDown(self):
super(TestCinderApiCmd, self).tearDown()
@@ -90,7 +89,6 @@ class TestCinderBackupCmd(test.TestCase):
def setUp(self):
super(TestCinderBackupCmd, self).setUp()
sys.argv = ['cinder-backup']
CONF(sys.argv[1:], project='cinder', version=version.version_string())
def tearDown(self):
super(TestCinderBackupCmd, self).tearDown()
@@ -120,7 +118,6 @@ class TestCinderAllCmd(test.TestCase):
def setUp(self):
super(TestCinderAllCmd, self).setUp()
sys.argv = ['cinder-all']
CONF(sys.argv[1:], project='cinder', version=version.version_string())
def tearDown(self):
super(TestCinderAllCmd, self).tearDown()
@@ -298,7 +295,6 @@ class TestCinderSchedulerCmd(test.TestCase):
def setUp(self):
super(TestCinderSchedulerCmd, self).setUp()
sys.argv = ['cinder-scheduler']
CONF(sys.argv[1:], project='cinder', version=version.version_string())
def tearDown(self):
super(TestCinderSchedulerCmd, self).tearDown()
@@ -328,7 +324,6 @@ class TestCinderVolumeCmd(test.TestCase):
def setUp(self):
super(TestCinderVolumeCmd, self).setUp()
sys.argv = ['cinder-volume']
CONF(sys.argv[1:], project='cinder', version=version.version_string())
def tearDown(self):
super(TestCinderVolumeCmd, self).tearDown()
@@ -391,7 +386,6 @@ class TestCinderManageCmd(test.TestCase):
def setUp(self):
super(TestCinderManageCmd, self).setUp()
sys.argv = ['cinder-manage']
CONF(sys.argv[1:], project='cinder', version=version.version_string())
def tearDown(self):
super(TestCinderManageCmd, self).tearDown()
@@ -1089,7 +1083,6 @@ class TestCinderRtstoolCmd(test.TestCase):
def setUp(self):
super(TestCinderRtstoolCmd, self).setUp()
sys.argv = ['cinder-rtstool']
CONF(sys.argv[1:], project='cinder', version=version.version_string())
self.INITIATOR_IQN = 'iqn.2015.12.com.example.openstack.i:UNIT1'
self.TARGET_IQN = 'iqn.2015.12.com.example.openstack.i:TARGET1'
@@ -1687,7 +1680,6 @@ class TestCinderVolumeUsageAuditCmd(test.TestCase):
def setUp(self):
super(TestCinderVolumeUsageAuditCmd, self).setUp()
sys.argv = ['cinder-volume-usage-audit']
CONF(sys.argv[1:], project='cinder', version=version.version_string())
def tearDown(self):
super(TestCinderVolumeUsageAuditCmd, self).tearDown()