summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-01-13 05:20:26 +0000
committerGerrit Code Review <review@openstack.org>2012-01-13 05:20:26 +0000
commit6d80851279052a30b98e465106f158cb2afdb6a5 (patch)
tree3155906c732d66fcfd3e05f8e3651c72b34cdc57
parent90903a0ca8b85afcbb35a1c194a56753990888dc (diff)
parent021b4d576c834c120c8e54df4691a49880261f14 (diff)
downloadnova-6d80851279052a30b98e465106f158cb2afdb6a5.tar.gz
nova-6d80851279052a30b98e465106f158cb2afdb6a5.tar.xz
nova-6d80851279052a30b98e465106f158cb2afdb6a5.zip
Merge "Remove skipping of 2 tests"
-rw-r--r--nova/tests/test_compute.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index ee98aeab1..56906b81f 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -821,7 +821,6 @@ class ComputeTestCase(BaseTestCase):
instance['uuid'])
self.compute.terminate_instance(self.context, instance['uuid'])
- @test.skip_test('test fails: lp892005')
def test_instance_set_to_error_on_uncaught_exception(self):
"""Test that instance is set to error state when exception is raised"""
instance = self._create_fake_instance()
@@ -850,7 +849,6 @@ class ComputeTestCase(BaseTestCase):
self.compute.terminate_instance(self.context, instance['uuid'])
- @test.skip_test('test fails: lp892005')
def test_network_is_deallocated_on_spawn_failure(self):
"""When a spawn fails the network must be deallocated"""
instance = self._create_fake_instance()