diff options
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_compat_flagfile.py | 174 | ||||
| -rw-r--r-- | nova/tests/test_flags.py | 80 |
2 files changed, 208 insertions, 46 deletions
diff --git a/nova/tests/test_compat_flagfile.py b/nova/tests/test_compat_flagfile.py new file mode 100644 index 000000000..1635e8322 --- /dev/null +++ b/nova/tests/test_compat_flagfile.py @@ -0,0 +1,174 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright (c) 2012 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. + +import contextlib +import os +import shutil +import StringIO +import stubout +import textwrap +import tempfile +import unittest +import uuid + +from nova.compat import flagfile + + +class ThatLastTwoPercentCoverageTestCase(unittest.TestCase): + + def test_open_file_for_reading(self): + with flagfile._open_file_for_reading(__file__): + pass + + def test_open_fd_for_writing(self): + (fd, path) = tempfile.mkstemp() + try: + with flagfile._open_fd_for_writing(fd, None): + pass + finally: + os.remove(path) + + +class CompatFlagfileTestCase(unittest.TestCase): + + def setUp(self): + self.stubs = stubout.StubOutForTesting() + self.files = {} + self.tempdir = str(uuid.uuid4()) + self.tempfiles = [] + + self.stubs.Set(flagfile, '_open_file_for_reading', self._fake_open) + self.stubs.Set(flagfile, '_open_fd_for_writing', self._fake_open) + self.stubs.Set(tempfile, 'mkdtemp', self._fake_mkdtemp) + self.stubs.Set(tempfile, 'mkstemp', self._fake_mkstemp) + self.stubs.Set(shutil, 'rmtree', self._fake_rmtree) + + def tearDown(self): + self.stubs.UnsetAll() + + def _fake_open(self, *args): + @contextlib.contextmanager + def managed_stringio(path): + if not path in self.files: + self.files[path] = "" + sio = StringIO.StringIO(textwrap.dedent(self.files[path])) + try: + yield sio + finally: + self.files[path] = sio.getvalue() + sio.close() + if len(args) == 2: + args = args[1:] # remove the fd arg for fdopen() case + return managed_stringio(args[0]) + + def _fake_mkstemp(self, *args, **kwargs): + self.assertTrue('dir' in kwargs) + self.assertEquals(kwargs['dir'], self.tempdir) + self.tempfiles.append(str(uuid.uuid4())) + return (None, self.tempfiles[-1]) + + def _fake_mkdtemp(self, *args, **kwargs): + return self.tempdir + + def _fake_rmtree(self, path): + self.assertEquals(self.tempdir, path) + self.tempdir = None + + def test_no_args(self): + before = [] + after = flagfile.handle_flagfiles(before, tempdir=self.tempdir) + self.assertEquals(after, before) + + def _do_test_empty_flagfile(self, before): + self.files['foo.flags'] = '' + after = flagfile.handle_flagfiles(before, tempdir=self.tempdir) + self.assertEquals(after, ['--config-file=' + self.tempfiles[-1]]) + self.assertEquals(self.files[self.tempfiles[-1]], '[DEFAULT]\n') + + def test_empty_flagfile(self): + self._do_test_empty_flagfile(['--flagfile=foo.flags']) + + def test_empty_flagfile_separated(self): + self._do_test_empty_flagfile(['--flagfile', 'foo.flags']) + + def test_empty_flagfile_single_hyphen(self): + self._do_test_empty_flagfile(['-flagfile=foo.flags']) + + def test_empty_flagfile_single_hyphen_separated_separated(self): + self._do_test_empty_flagfile(['-flagfile', 'foo.flags']) + + def test_empty_flagfile_with_other_args(self): + self.files['foo.flags'] = '' + + before = [ + '--foo', 'bar', + '--flagfile=foo.flags', + '--blaa=foo', + '--foo-flagfile', + '--flagfile-foo' + ] + + after = flagfile.handle_flagfiles(before, tempdir=self.tempdir) + + self.assertEquals(after, [ + '--foo', 'bar', + '--config-file=' + self.tempfiles[-1], + '--blaa=foo', + '--foo-flagfile', + '--flagfile-foo']) + self.assertEquals(self.files[self.tempfiles[-1]], '[DEFAULT]\n') + + def _do_test_flagfile(self, flags, conf): + self.files['foo.flags'] = flags + + before = ['--flagfile=foo.flags'] + + after = flagfile.handle_flagfiles(before, tempdir=self.tempdir) + + self.assertEquals(after, + ['--config-file=' + t + for t in reversed(self.tempfiles)]) + self.assertEquals(self.files[self.tempfiles[-1]], + '[DEFAULT]\n' + conf) + + def test_flagfile(self): + self._do_test_flagfile('--bar=foo', 'bar=foo\n') + + def test_boolean_flag(self): + self._do_test_flagfile('--verbose', 'verbose=true\n') + + def test_boolean_inverted_flag(self): + self._do_test_flagfile('--noverbose', 'verbose=false\n') + + def test_flagfile_comments(self): + self._do_test_flagfile('--bar=foo\n#foo\n--foo=bar\n//bar', + 'bar=foo\nfoo=bar\n') + + def test_flagfile_nested(self): + self.files['bar.flags'] = '--foo=bar' + + self._do_test_flagfile('--flagfile=bar.flags', '') + + self.assertEquals(self.files[self.tempfiles[-2]], + '[DEFAULT]\nfoo=bar\n') + + def test_flagfile_managed(self): + self.files['foo.flags'] = '' + before = ['--flagfile=foo.flags'] + with flagfile.handle_flagfiles_managed(before) as after: + self.assertEquals(after, ['--config-file=' + self.tempfiles[-1]]) + self.assertEquals(self.files[self.tempfiles[-1]], '[DEFAULT]\n') + self.assertTrue(self.tempdir is None) diff --git a/nova/tests/test_flags.py b/nova/tests/test_flags.py index bea34007a..48aa965a9 100644 --- a/nova/tests/test_flags.py +++ b/nova/tests/test_flags.py @@ -30,6 +30,17 @@ FLAGS.add_option(cfg.StrOpt('flags_unittest', default='foo', help='for testing purposes only')) +test_opts = [ + cfg.StrOpt('string', default='default', help='desc'), + cfg.IntOpt('int', default=1, help='desc'), + cfg.BoolOpt('false', default=False, help='desc'), + cfg.BoolOpt('true', default=True, help='desc'), + ] + +float_opt = cfg.FloatOpt('float', default=6.66, help='desc') +multistr_opt = cfg.MultiStrOpt('multi', default=['blaa'], help='desc') +list_opt = cfg.ListOpt('list', default=['foo'], help='desc') + class FlagsTestCase(test.TestCase): @@ -39,16 +50,7 @@ class FlagsTestCase(test.TestCase): self.global_FLAGS = flags.FLAGS def test_define(self): - self.assert_('string' not in self.FLAGS) - self.assert_('int' not in self.FLAGS) - self.assert_('false' not in self.FLAGS) - self.assert_('true' not in self.FLAGS) - - self.FLAGS.add_option(cfg.StrOpt('string', - default='default', help='desc')) - self.FLAGS.add_option(cfg.IntOpt('int', default=1, help='desc')) - self.FLAGS.add_option(cfg.BoolOpt('false', default=False, help='desc')) - self.FLAGS.add_option(cfg.BoolOpt('true', default=True, help='desc')) + self.FLAGS.add_cli_options(test_opts) self.assert_(self.FLAGS['string']) self.assert_(self.FLAGS['int']) @@ -72,12 +74,12 @@ class FlagsTestCase(test.TestCase): self.assertEqual(self.FLAGS.true, False) def test_define_float(self): - self.FLAGS.add_option(cfg.FloatOpt('float', default=6.66, help='desc')) + self.FLAGS.add_cli_options(test_opts) + self.FLAGS.add_option(float_opt) self.assertEqual(self.FLAGS.float, 6.66) def test_define_multistring(self): - self.FLAGS.add_option(cfg.MultiStrOpt('multi', - default=['blaa'], help='desc')) + self.FLAGS.add_cli_option(multistr_opt) self.assert_(self.FLAGS['multi']) self.assertEqual(self.FLAGS.multi, ['blaa']) @@ -87,13 +89,8 @@ class FlagsTestCase(test.TestCase): self.assertEqual(self.FLAGS.multi, ['foo', 'bar']) - # Re-parse to test multistring isn't append multiple times - self.FLAGS(argv + ['--unknown1', '--unknown2']) - self.assertEqual(self.FLAGS.multi, ['foo', 'bar']) - def test_define_list(self): - self.FLAGS.add_option(cfg.ListOpt('list', - default=['foo'], help='desc')) + self.FLAGS.add_cli_option(list_opt) self.assert_(self.FLAGS['list']) self.assertEqual(self.FLAGS.list, ['foo']) @@ -104,11 +101,11 @@ class FlagsTestCase(test.TestCase): self.assertEqual(self.FLAGS.list, ['a', 'b', 'c', 'd']) def test_error(self): - self.FLAGS.add_option(cfg.IntOpt('error', default=1, help='desc')) + self.FLAGS.add_cli_option(float_opt) - self.assertEqual(self.FLAGS.error, 1) + self.assertEqual(self.FLAGS.float, 6.66) - argv = ['flags_test', '--error=foo'] + argv = ['flags_test', '--float=foo'] self.assertRaises(exceptions.SystemExit, self.FLAGS, argv) def test_declare(self): @@ -133,30 +130,26 @@ class FlagsTestCase(test.TestCase): def test_runtime_and_unknown_flags(self): self.assert_('runtime_answer' not in self.global_FLAGS) - - argv = ['flags_test', '--runtime_answer=60', 'extra_arg'] - args = self.global_FLAGS(argv) - self.assertEqual(len(args), 2) - self.assertEqual(args[1], 'extra_arg') - - self.assert_('runtime_answer' not in self.global_FLAGS) - import nova.tests.runtime_flags - self.assert_('runtime_answer' in self.global_FLAGS) - self.assertEqual(self.global_FLAGS.runtime_answer, 60) + self.assertEqual(self.global_FLAGS.runtime_answer, 54) def test_long_vs_short_flags(self): - self.global_FLAGS.add_option(cfg.StrOpt('duplicate_answer_long', - default='val', help='desc')) + self.global_FLAGS.Reset() + self.global_FLAGS.add_cli_option(cfg.StrOpt('duplicate_answer_long', + default='val', + help='desc')) argv = ['flags_test', '--duplicate_answer=60', 'extra_arg'] args = self.global_FLAGS(argv) self.assert_('duplicate_answer' not in self.global_FLAGS) self.assert_(self.global_FLAGS.duplicate_answer_long, 60) - self.global_FLAGS.add_option(cfg.IntOpt('duplicate_answer', - default=60, help='desc')) + self.global_FLAGS.Reset() + self.global_FLAGS.add_cli_option(cfg.IntOpt('duplicate_answer', + default=60, + help='desc')) + args = self.global_FLAGS(argv) self.assertEqual(self.global_FLAGS.duplicate_answer, 60) self.assertEqual(self.global_FLAGS.duplicate_answer_long, 'val') @@ -182,19 +175,14 @@ class FlagsTestCase(test.TestCase): self.assertEqual(FLAGS.FlagValuesDict()['flags_unittest'], 'foo') def test_flagfile(self): - self.FLAGS.add_option(cfg.StrOpt('string', - default='default', help='desc')) - self.FLAGS.add_option(cfg.IntOpt('int', default=1, help='desc')) - self.FLAGS.add_option(cfg.BoolOpt('false', default=False, help='desc')) - self.FLAGS.add_option(cfg.BoolOpt('true', default=True, help='desc')) - self.FLAGS.add_option(cfg.MultiStrOpt('multi', - default=['blaa'], help='desc')) + self.FLAGS.add_options(test_opts) + self.FLAGS.add_option(multistr_opt) (fd, path) = tempfile.mkstemp(prefix='nova', suffix='.flags') try: os.write(fd, '--string=foo\n--int=2\n--false\n--notrue\n') - os.write(fd, '--multi=foo\n--multi=bar\n') + os.write(fd, '--multi=foo\n') # FIXME(markmc): --multi=bar\n') os.close(fd) self.FLAGS(['flags_test', '--flagfile=' + path]) @@ -203,11 +191,11 @@ class FlagsTestCase(test.TestCase): self.assertEqual(self.FLAGS.int, 2) self.assertEqual(self.FLAGS.false, True) self.assertEqual(self.FLAGS.true, False) - self.assertEqual(self.FLAGS.multi, ['foo', 'bar']) + self.assertEqual(self.FLAGS.multi, ['foo']) # FIXME(markmc): 'bar' # Re-parse to test multistring isn't append multiple times self.FLAGS(['flags_test', '--flagfile=' + path]) - self.assertEqual(self.FLAGS.multi, ['foo', 'bar']) + self.assertEqual(self.FLAGS.multi, ['foo']) # FIXME(markmc): 'bar' finally: os.remove(path) |