Merge pull request shotgunsoftware#62 from shotgunsoftware/test-bug-fixes

brandonvfx · brandonvfx · commit b09d37029ea1 · 2014-04-30T12:30:23.000-07:00
Bug fixes for unittest methods with older versions of python
diff --git a/tests/test_api.py b/tests/test_api.py
@@ -1310,17 +1310,15 @@ def test_zero_is_not_none(self):
 
         # Should not be filtered out
         result = self.sg.find_one( 'Asset', [['id','is',self.asset['id']],[num_field, 'is_not', None]] ,[num_field] )
-        self.assertIsNotNone(result)
+        self.assertFalse(result == None)
 
 
         # Set it to some other number
         self.sg.update( 'Asset', self.asset['id'], { num_field: 1 })
 
         # Should not be filtered out
         result = self.sg.find_one( 'Asset', [['id','is',self.asset['id']],[num_field, 'is_not', None]] ,[num_field] )
-        self.assertIsNotNone(result)
-
-
+        self.assertFalse(result == None)
 
 
 class TestFollow(base.LiveTestBase):
@@ -1439,7 +1437,16 @@ def test_human_user_sudo_auth_fails(self):
                     password=self.config.human_password,
                     http_proxy=self.config.http_proxy,
                     sudo_as_login="blah" )
-        self.assertRaisesRegexp(shotgun_api3.Fault, "does not have permission to 'sudo'", x.find_one, 'Shot', [])
+        self.assertRaises(shotgun_api3.Fault, x.find_one, 'Shot', [])
+        try :
+            x.find_one('Shot',[])
+        except shotgun_api3.Fault, e:
+            # py24 exceptions don't have message attr
+            if hasattr(e, 'message'):
+                self.assertEquals("The user does not have permission to 'sudo': ", e.message)
+            else:
+                self.assertEquals("The user does not have permission to 'sudo': ", e.args[0])
+
 
 
 class TestHumanUserAuth(base.HumanUserAuthLiveTestBase):
