x/vmware-nsx
Code Issues Proposed changes

Fix state_path in tests

Browse Source 
cfg.CONF.state_path is set to a random temporary directory
in neutron.tests.base:BaseTestCase.setUp. This value was then
over written in neutron.tests.unit.__init__. Tests that need
to read or pass cfg.CONF.state_path were getting the directory
from which the tests were running and not the temporary directory
specially created for the current test run. Note that the usage
of state_path to set lock_path, dhcp state path and the likes
was working as expected, and was not affected by this bug.

Closes-Bug: #1363058
Change-Id: Ib45f663fadaf0f3b4a79a0db4128822187b61ecc
This commit is contained in:
Assaf Muller 2014-08-29 14:44:10 +03:00
parent 4e2b5b2495
commit 6d002d25bb
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/tests/unit/__init__.py
View File

@ -13,12 +13,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import os
from oslo.config import cfg from oslo.config import cfg
reldir = os.path.join(os.path.dirname(__file__), '..', '..', '..')
absdir = os.path.abspath(reldir)
cfg.CONF.state_path = absdir
cfg.CONF.use_stderr = False cfg.CONF.use_stderr = False

6
neutron/tests/unit/test_config.py
View File

@ -13,8 +13,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import os
import mock import mock
from oslo.config import cfg from oslo.config import cfg
@ -42,10 +40,6 @@ class ConfigurationTest(base.BaseTestCase):
self.assertTrue(cfg.CONF.allow_bulk) self.assertTrue(cfg.CONF.allow_bulk)
self.assertEqual(5, cfg.CONF.max_dns_nameservers) self.assertEqual(5, cfg.CONF.max_dns_nameservers)
self.assertEqual(20, cfg.CONF.max_subnet_host_routes) self.assertEqual(20, cfg.CONF.max_subnet_host_routes)
relative_dir = os.path.join(os.path.dirname(__file__),
'..', '..', '..')
absolute_dir = os.path.abspath(relative_dir)
self.assertEqual(absolute_dir, cfg.CONF.state_path)
self.assertEqual(86400, cfg.CONF.dhcp_lease_duration) self.assertEqual(86400, cfg.CONF.dhcp_lease_duration)
self.assertFalse(cfg.CONF.allow_overlapping_ips) self.assertFalse(cfg.CONF.allow_overlapping_ips)
self.assertEqual('neutron', cfg.CONF.control_exchange) self.assertEqual('neutron', cfg.CONF.control_exchange)