Merge "fix incorrect pathname"

This commit is contained in:
Jenkins 2013-03-06 01:47:36 +00:00 committed by Gerrit Code Review
commit f1f914b687

View File

@ -37,8 +37,10 @@ class ConfigurationTest(testtools.TestCase):
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)
self.assertEqual(os.path.abspath('../../..'), relative_dir = os.path.join(os.path.dirname(__file__),
cfg.CONF.state_path) '..', '..', '..')
absolute_dir = os.path.abspath(relative_dir)
self.assertEqual(absolute_dir, cfg.CONF.state_path)
self.assertEqual(120, cfg.CONF.dhcp_lease_duration) self.assertEqual(120, cfg.CONF.dhcp_lease_duration)
self.assertFalse(cfg.CONF.allow_overlapping_ips) self.assertFalse(cfg.CONF.allow_overlapping_ips)
self.assertEqual('quantum', cfg.CONF.control_exchange) self.assertEqual('quantum', cfg.CONF.control_exchange)