diff options
| author | Dan Prince <dan.prince@rackspace.com> | 2011-08-22 10:01:13 -0400 |
|---|---|---|
| committer | Dan Prince <dan.prince@rackspace.com> | 2011-08-22 10:01:13 -0400 |
| commit | 44aea954e5efa7d94d8333ddbf54dab6464018a0 (patch) | |
| tree | 192edeb95400c568eb1ae166f346f8041be070df /nova/tests | |
| parent | f82d2d309a0f826522854fe331d1c53b8c6d6879 (diff) | |
Renamed task_state to task_states...
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/api/openstack/test_server_actions.py | 1 | ||||
| -rw-r--r-- | nova/tests/vmwareapi/db_fakes.py | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/nova/tests/api/openstack/test_server_actions.py b/nova/tests/api/openstack/test_server_actions.py index 6f8be0f47..011f83773 100644 --- a/nova/tests/api/openstack/test_server_actions.py +++ b/nova/tests/api/openstack/test_server_actions.py @@ -13,7 +13,6 @@ from nova import flags from nova.api.openstack import create_instance_helper from nova.compute import instance_types from nova.compute import vm_states -from nova.compute import task_state import nova.db.api from nova import test from nova.tests.api.openstack import common diff --git a/nova/tests/vmwareapi/db_fakes.py b/nova/tests/vmwareapi/db_fakes.py index dd38420ce..b046071c7 100644 --- a/nova/tests/vmwareapi/db_fakes.py +++ b/nova/tests/vmwareapi/db_fakes.py @@ -23,7 +23,7 @@ import time from nova import db
from nova import utils
-from nova.compute import task_state
+from nova.compute import task_states
from nova.compute import vm_states
@@ -67,7 +67,7 @@ def stub_out_db_instance_api(stubs): 'kernel_id': values['kernel_id'],
'ramdisk_id': values['ramdisk_id'],
'vm_state': vm_states.BUILD,
- 'task_state': task_state.SCHEDULE,
+ 'task_state': task_states.SCHEDULE,
'user_id': values['user_id'],
'project_id': values['project_id'],
'launch_time': time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime()),
|