Merge lp:~mordred/nova/release-0.9.0 into lp:~hudson-openstack/nova/trunk

Proposed by Monty Taylor
Status: Merged
Approved by: Monty Taylor
Approved revision: no longer in the source branch.
Merge reported by: OpenStack Infra
Merged at revision: not available
Proposed branch: lp:~mordred/nova/release-0.9.0
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 13 lines (+2/-1)
1 file modified
run_tests.py (+2/-1)
To merge this branch: bzr merge lp:~mordred/nova/release-0.9.0
Reviewer Review Type Date Requested Status
Nova Core security contacts Pending
Review via email: mp+31299@code.launchpad.net

Commit message

Fixed pep8 in run_test.py.

Description of the change

Trying a remerged real quick. Do not look at the man behind the curtain - tarmac testing.

To post a comment you must log in.
Revision history for this message
OpenStack Infra (hudson-openstack) wrote :

There is no resulting diff between lp:~mordred/nova/release-0.9.0 and lp:nova.

Revision history for this message
OpenStack Infra (hudson-openstack) wrote :

There is no resulting diff between lp:~mordred/nova/release-0.9.0 and lp:nova.

lp:~mordred/nova/release-0.9.0 updated
198. By Monty Taylor

Fixed pep8 in run_test.py.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'run_tests.py'
--- run_tests.py 2010-07-27 20:08:22 +0000
+++ run_tests.py 2010-07-29 15:39:46 +0000
@@ -68,7 +68,8 @@
68 'Flush the database before running fake tests')68 'Flush the database before running fake tests')
6969
70flags.DEFINE_string('tests_stderr', 'run_tests.err.log',70flags.DEFINE_string('tests_stderr', 'run_tests.err.log',
71 'Path to where to pipe STDERR during test runs. Default = "run_tests.err.log"')71 'Path to where to pipe STDERR during test runs. '
72 'Default = "run_tests.err.log"')
7273
73if __name__ == '__main__':74if __name__ == '__main__':
74 OptionsClass = twistd.WrapTwistedOptions(trial_script.Options)75 OptionsClass = twistd.WrapTwistedOptions(trial_script.Options)