Commits

Olemis Lang  committed b0a8d5d Merge

BH Multiproduct #350 : Incorporating bug fix for callableObj in assertRaises

  • Participants
  • Parent commits a36a98c, ca08d76
  • Branches t350_product_components

Comments (0)

Files changed (1)

File t115/t115_r1433322_unittest2_assertRaises_msg.diff

 
 diff -r 3386dd0e88c3 bloodhound_multiproduct/multiproduct/env.py
 --- a/bloodhound_multiproduct/multiproduct/env.py	Tue Jan 15 09:32:53 2013 +0000
-+++ b/bloodhound_multiproduct/multiproduct/env.py	Tue Jan 15 10:01:21 2013 -0500
++++ b/bloodhound_multiproduct/multiproduct/env.py	Tue Jan 15 17:10:55 2013 -0500
 @@ -208,10 +208,11 @@
                          multiproduct.model.Product
          """
  
 diff -r 3386dd0e88c3 bloodhound_multiproduct/tests/env.py
 --- a/bloodhound_multiproduct/tests/env.py	Tue Jan 15 09:32:53 2013 +0000
-+++ b/bloodhound_multiproduct/tests/env.py	Tue Jan 15 10:01:21 2013 -0500
++++ b/bloodhound_multiproduct/tests/env.py	Tue Jan 15 17:10:55 2013 -0500
 @@ -18,19 +18,20 @@
  
  """Tests for Apache(TM) Bloodhound's product environments"""
 +            return self._AssertRaisesLoggingContext(excClass, self)
 +        else:
 +            return unittest.TestCase.assertRaises(
-+                    self, excClass, callableObj=None, *args, **kwargs)
++                    self, excClass, callableObj, *args, **kwargs)
 +
      # Product data