Changed tests to not use self.assertRaises like a context manager (e.g. 'with self.assertRaises...') to enuser python 2.6 test compatibility. Added self.fail() to try expect statements for points that should be reached as an exception should occur.

cameronmaske · cameronmaske · commit 0b163fb1a6d4 · 2013-11-18T11:11:06.000Z
diff --git a/tests/unit/test_user.py b/tests/unit/test_user.py
@@ -165,8 +165,7 @@ def test_find_by_email(self):
         self.assertEqual('Santiago', user.location_data.city_name)
         self.assertTrue(isinstance(user.location_data, LocationData))
         self.assertEqual('johnny', user.custom_data['nick'])
-        with self.assertRaises(AttributeError):
-            user.companies
+        self.assertRaises(AttributeError, lambda: user.companies)
 
     @patch('requests.request', create_response(200, 'get_user_id_valid.json'))
     def test_find_by_user_id(self):
@@ -206,6 +205,7 @@ def test_properties(self):
         try:
             # cannot set the relationship score
             user.relationship_score = 50
+            self.fail()
         except AttributeError:
             pass
 
@@ -218,30 +218,33 @@ def test_properties(self):
         self.assertEqual(1331764344,
                 time.mktime(user.created_at.timetuple()))
         self.assertEqual('Ace', user.custom_data['name'])
-        with self.assertRaises(AttributeError):
-            user.companies
+        self.assertRaises(AttributeError, lambda: user.companies)
 
     def test_company(self):
         user = User()
         user.company = {
             'id': 1,
             'name':' Intercom',
             'created_at': datetime.fromtimestamp(1331764344)}
-        with self.assertRaises(AttributeError):
-            user.company
-        with self.assertRaises(ValueError):
+        self.assertRaises(AttributeError, lambda: user.company)
+        try:
             user.company = ['foo']
+            self.fail()
+        except ValueError:
+            pass
 
     def test_companies(self):
         user = User()
         user.companies = [{
             'id': 1,
             'name':' Intercom',
             'created_at': datetime.fromtimestamp(1331764344)}]
-        with self.assertRaises(AttributeError):
-            user.companise
-        with self.assertRaises(ValueError):
+        self.assertRaises(AttributeError, lambda: user.companies)
+        try:
             user.companies = {'foo':'bar'}
+            self.fail()
+        except ValueError:
+            pass
 
 class LocationDataTest(TestCase):
 
