From 471386aaf8eeb28ff5842073257c82a9072cc80d Mon Sep 17 00:00:00 2001 From: Tomas Tomecek Date: Oct 23 2015 12:59:59 +0000 Subject: don't use assertRaises --- diff --git a/test/commands/test_check_repo.py b/test/commands/test_check_repo.py index 5a21311..0ca24df 100644 --- a/test/commands/test_check_repo.py +++ b/test/commands/test_check_repo.py @@ -39,10 +39,12 @@ class CheckRepoCase(CommandTestCase): with open(os.path.join(self.clonedir, 'sources'), 'w') as fd: fd.write("a") - with self.assertRaises(rpkgError) as cm: + try: self.cmd.check_repo(is_dirty=True, all_pushed=False) - exception = cm.exception - self.assertTrue("has uncommitted changes" in str(exception)) + except rpkgError as exception: + self.assertTrue("has uncommitted changes" in str(exception)) + else: + self.fail("Expected an rpkgError exception.") def test_repo_has_unpushed_changes(self): with open(os.path.join(self.clonedir, 'sources'), 'w') as fd: @@ -56,11 +58,13 @@ class CheckRepoCase(CommandTestCase): cwd=self.clonedir, ) - with self.assertRaises(rpkgError) as cm: + try: self.cmd.check_repo(is_dirty=False, all_pushed=True) - exception = cm.exception - self.assertTrue("There are unpushed changes in your repo" in - str(exception)) + except rpkgError as exception: + self.assertTrue("There are unpushed changes in your repo" in + str(exception)) + else: + self.fail("Expected an rpkgError exception.") def test_repo_is_clean(self): self.cmd.check_repo(is_dirty=True, all_pushed=False)