diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-08-02 18:37:49 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-08-02 18:37:49 +0000 |
| commit | cf7eefab9e7891d449b115c0c50c4b76ae45743f (patch) | |
| tree | 3fd97a06fda3cadd50b1a3595836a8ba5d29394d /nova/tests | |
| parent | d6175dddfe481a9d3cd4e9d8c8570911fa785a7d (diff) | |
| parent | 07646e85841a4f7c81e80254ac63715bece2aadd (diff) | |
- Remove Twisted dependency from pip-requires
- Remove Twisted patch from tools/install_venv.py
- Remove eventlet patch from tools/install_venv.py
- Remove tools/eventlet-patch
- Remove nova/twistd.py
- Remove nova/tests/test_twistd.py
- Remove bin/nova-instancemonitor
- Remove nova/compute/monitor.py
- Add xattr to pip-requires until glance setup.py installs it correctly
- Remove references to removed files from docs/translations/code
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_twistd.py | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/nova/tests/test_twistd.py b/nova/tests/test_twistd.py deleted file mode 100644 index ff8627c3b..000000000 --- a/nova/tests/test_twistd.py +++ /dev/null @@ -1,53 +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. - -import StringIO -import sys - -from nova import twistd -from nova import exception -from nova import flags -from nova import test - - -FLAGS = flags.FLAGS - - -class TwistdTestCase(test.TestCase): - def setUp(self): - super(TwistdTestCase, self).setUp() - self.Options = twistd.WrapTwistedOptions(twistd.TwistdServerOptions) - sys.stdout = StringIO.StringIO() - - def tearDown(self): - super(TwistdTestCase, self).tearDown() - sys.stdout = sys.__stdout__ - - def test_basic(self): - options = self.Options() - argv = options.parseOptions() - - def test_logfile(self): - options = self.Options() - argv = options.parseOptions(['--logfile=foo']) - self.assertEqual(FLAGS.logfile, 'foo') - - def test_help(self): - options = self.Options() - self.assertRaises(SystemExit, options.parseOptions, ['--help']) - self.assert_('pidfile' in sys.stdout.getvalue()) |
