Permalink
Browse files

Fix remaining integration tests following DTRS changes

  • Loading branch information...
1 parent 2c1ec76 commit af1857a360ae5e7a645e66a562efb5ad0b044c27 @priteau priteau committed Mar 25, 2013
Showing with 4 additions and 12 deletions.
  1. +2 −6 epu/test/test_integration_dtrs.py
  2. +2 −6 epu/test/test_integration_site.py
@@ -183,9 +183,5 @@ def dtrs_update_dt_that_doesnt_exist_test(self):
def dtrs_describe_dt_that_doesnt_exist_test(self):
new_dt_name = str(uuid.uuid4())
- passed = False
- try:
- self.dtrs_client.describe_dt(self.user, new_dt_name)
- except DashiError:
- passed = True
- self.assertTrue(passed, "an exception should have been raised")
+ dt = self.dtrs_client.describe_dt(self.user, new_dt_name)
+ self.assertEqual(dt, None)
@@ -169,9 +169,5 @@ def site_simple_update_no_there_test(self):
def site_simple_add_describe_not_exist_remove_test(self):
name = str(uuid.uuid4())
- passed = False
- try:
- self.dtrs_client.describe_site(name)
- except DashiError:
- passed = True
- self.assertTrue(passed, "An exception should have been raised")
+ site = self.dtrs_client.describe_site(name)
+ self.assertEqual(site, None)

0 comments on commit af1857a

Please sign in to comment.