diff options
author | Mark McLoughlin <markmc@redhat.com> | 2012-11-23 07:14:05 +0000 |
---|---|---|
committer | Mark McLoughlin <markmc@redhat.com> | 2012-11-23 07:15:36 +0000 |
commit | 0bfa3486d031588733e3358c1bbf27055d66c9c9 (patch) | |
tree | 792cbd8419a698f38ea1c869b2106317d40d7f57 | |
parent | 2e1ff2e72580c2e9b123aded0916ebb5358b2aea (diff) | |
download | nova-0bfa3486d031588733e3358c1bbf27055d66c9c9.tar.gz nova-0bfa3486d031588733e3358c1bbf27055d66c9c9.tar.xz nova-0bfa3486d031588733e3358c1bbf27055d66c9c9.zip |
Remove stale flags unit tests
The tests in test_flags don't test any Nova specific code. At this point
they just test a fairly random set of cfg use cases that are already
covered by cfg's unit tests.
Change-Id: I752d9676824eb479fcaef2c89a0a42fcfab45f8c
-rw-r--r-- | nova/tests/declare_flags.py | 22 | ||||
-rw-r--r-- | nova/tests/runtime_flags.py | 22 | ||||
-rw-r--r-- | nova/tests/test_flags.py | 90 |
3 files changed, 0 insertions, 134 deletions
diff --git a/nova/tests/declare_flags.py b/nova/tests/declare_flags.py deleted file mode 100644 index 476397261..000000000 --- a/nova/tests/declare_flags.py +++ /dev/null @@ -1,22 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright 2010 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from nova.openstack.common import cfg - -CONF = cfg.CONF -CONF.register_opt(cfg.IntOpt('answer', default=42, help='test flag')) diff --git a/nova/tests/runtime_flags.py b/nova/tests/runtime_flags.py deleted file mode 100644 index fe5fed1ed..000000000 --- a/nova/tests/runtime_flags.py +++ /dev/null @@ -1,22 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright 2010 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from nova.openstack.common import cfg - -CONF = cfg.CONF -CONF.register_opt(cfg.IntOpt('runtime_answer', default=54, help='test flag')) diff --git a/nova/tests/test_flags.py b/nova/tests/test_flags.py deleted file mode 100644 index dd83c4ffd..000000000 --- a/nova/tests/test_flags.py +++ /dev/null @@ -1,90 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright 2010 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# All Rights Reserved. -# Copyright 2011 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from nova import config -from nova.openstack.common import cfg -from nova import test - -CONF = cfg.CONF -CONF.register_opt(cfg.StrOpt('flags_unittest', - default='foo', - help='for testing purposes only')) - - -class FlagsTestCase(test.TestCase): - def test_declare(self): - self.assert_('answer' not in CONF) - CONF.import_opt('answer', 'nova.tests.declare_flags') - self.assert_('answer' in CONF) - self.assertEqual(CONF.answer, 42) - - # Make sure we don't overwrite anything - CONF.set_override('answer', 256) - self.assertEqual(CONF.answer, 256) - CONF.import_opt('answer', 'nova.tests.declare_flags') - self.assertEqual(CONF.answer, 256) - - def test_getopt_non_interspersed_args(self): - self.assert_('runtime_answer' not in CONF) - - argv = ['flags_test', 'extra_arg', '--runtime_answer=60'] - args = config.parse_args(argv, default_config_files=[]) - self.assertEqual(len(args), 3) - self.assertEqual(argv, args) - - def test_runtime_and_unknown_flags(self): - self.assert_('runtime_answer' not in CONF) - import nova.tests.runtime_flags - self.assert_('runtime_answer' in CONF) - self.assertEqual(CONF.runtime_answer, 54) - - def test_long_vs_short_flags(self): - CONF.clear() - CONF.register_cli_opt(cfg.StrOpt('duplicate_answer_long', - default='val', - help='desc')) - argv = ['flags_test', '--duplicate_answer=60', 'extra_arg'] - args = config.parse_args(argv, default_config_files=[]) - - self.assert_('duplicate_answer' not in CONF) - self.assert_(CONF.duplicate_answer_long, 60) - - CONF.clear() - CONF.register_cli_opt(cfg.IntOpt('duplicate_answer', - default=60, help='desc')) - args = config.parse_args(argv, default_config_files=[]) - self.assertEqual(CONF.duplicate_answer, 60) - self.assertEqual(CONF.duplicate_answer_long, 'val') - - def test_flag_leak_left(self): - self.assertEqual(CONF.flags_unittest, 'foo') - self.flags(flags_unittest='bar') - self.assertEqual(CONF.flags_unittest, 'bar') - - def test_flag_leak_right(self): - self.assertEqual(CONF.flags_unittest, 'foo') - self.flags(flags_unittest='bar') - self.assertEqual(CONF.flags_unittest, 'bar') - - def test_flag_overrides(self): - self.assertEqual(CONF.flags_unittest, 'foo') - self.flags(flags_unittest='bar') - self.assertEqual(CONF.flags_unittest, 'bar') - CONF.reset() - self.assertEqual(CONF.flags_unittest, 'foo') |