summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Lamar <brian.lamar@rackspace.com>2011-08-24 18:14:13 -0400
committerBrian Lamar <brian.lamar@rackspace.com>2011-08-24 18:14:13 -0400
commit5f1380bfc69913f6aeb2a64e3501f77973493bc3 (patch)
tree999d5fc244a295915175dbba28fba29d08cfa37a
parent575f72693fa20c7c4157c8ce9702751cd54f1a82 (diff)
Added fix for parallel build test.
-rw-r--r--nova/tests/api/openstack/test_server_actions.py2
-rw-r--r--run_tests.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/nova/tests/api/openstack/test_server_actions.py b/nova/tests/api/openstack/test_server_actions.py
index 0cbbe271d..eae74e75e 100644
--- a/nova/tests/api/openstack/test_server_actions.py
+++ b/nova/tests/api/openstack/test_server_actions.py
@@ -35,7 +35,7 @@ def return_server_with_attributes(**kwargs):
return _return_server
-def return_server_with_state(vm_state, task_state=None)
+def return_server_with_state(vm_state, task_state=None):
return return_server_with_attributes(vm_state=vm_state,
task_state=task_state)
diff --git a/run_tests.py b/run_tests.py
index fd836967e..b9a74769e 100644
--- a/run_tests.py
+++ b/run_tests.py
@@ -55,6 +55,7 @@ To run a single test module:
"""
+import eventlet
import gettext
import heapq
import os
@@ -62,6 +63,7 @@ import unittest
import sys
import time
+eventlet.monkey_patch()
gettext.install('nova', unicode=1)
from nose import config