x/vmware-nsx
Code Issues Proposed changes

Merge "Fix state_path in tests"

Browse Source
This commit is contained in:
Jenkins 2014-08-30 18:37:23 +00:00 committed by Gerrit Code Review
commit 7f52b2a35a
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
# under the License.
import os
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

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

@ -13,8 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import os
import mock
from oslo.config import cfg
@ -42,10 +40,6 @@ class ConfigurationTest(base.BaseTestCase):
self.assertTrue(cfg.CONF.allow_bulk)
self.assertEqual(5, cfg.CONF.max_dns_nameservers)
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.assertFalse(cfg.CONF.allow_overlapping_ips)
self.assertEqual('neutron', cfg.CONF.control_exchange)