diff options
| author | Monty Taylor <mordred@inaugust.com> | 2012-06-03 13:03:21 -0400 |
|---|---|---|
| committer | Monty Taylor <mordred@inaugust.com> | 2012-06-07 12:15:42 -0400 |
| commit | cf34a6015762a82780f86004a76439e1e21340f8 (patch) | |
| tree | 16581750173cc7e6e9baa956f5db60537dce19d9 /nova/log.py | |
| parent | 281979a7b602b3555617394a468871e8d237acf2 (diff) | |
| download | nova-cf34a6015762a82780f86004a76439e1e21340f8.tar.gz nova-cf34a6015762a82780f86004a76439e1e21340f8.tar.xz nova-cf34a6015762a82780f86004a76439e1e21340f8.zip | |
Finalize tox config.
Shrink tox.ini to the new short version.
Fix the test cases to be able to be run in nosetets plus the
openstack.nose_plugin, which finally removes the need for
nova/testing/runner.py
Also, now we'll just output directly to stdout, which will
make nose collect the trace logging directly and either output
it at the end of the run, or inject it into the xunit output
appropriately.
Change-Id: I1456e18a11a840145492038108bdfe812c8230d1
Diffstat (limited to 'nova/log.py')
| -rw-r--r-- | nova/log.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/log.py b/nova/log.py index 7970802f3..46a07b26c 100644 --- a/nova/log.py +++ b/nova/log.py @@ -361,7 +361,9 @@ def _setup_logging_from_flags(): nova_root.addHandler(streamlog) elif not FLAGS.log_file: - streamlog = logging.StreamHandler(stream=sys.stdout) + # pass sys.stdout as a positional argument + # python2.6 calls the argument strm, in 2.7 it's stream + streamlog = logging.StreamHandler(sys.stdout) nova_root.addHandler(streamlog) if FLAGS.publish_errors: |