Fixes unit tests for python 2.6

Author: zimbatm

pusher_tests/test_config.py

@@ -20,66 +20,44 @@ def test_should_be_constructable(self):
         Config(app_id=u'4', key=u'key', secret=u'secret', ssl=False)
 
     def test_app_id_should_be_text(self):
-        with self.assertRaises(TypeError):
-            Config(key=u'key', secret=u'secret', ssl=False)
-
-        with self.assertRaises(TypeError):
-            Config(app_id=4, key=u'key', secret=u'secret', ssl=False)
-
-        with self.assertRaises(TypeError):
-            Config(app_id=b'4', key=u'key', secret=u'secret', ssl=False)
+        self.assertRaises(TypeError, lambda: Config(key=u'key', secret=u'secret', ssl=False))
+        self.assertRaises(TypeError, lambda: Config(app_id=4, key=u'key', secret=u'secret', ssl=False))
+        self.assertRaises(TypeError, lambda: Config(app_id=b'4', key=u'key', secret=u'secret', ssl=False))
 
     def test_key_should_be_text(self):
-        with self.assertRaises(TypeError):
-            Config(app_id=u'4', secret=u'secret', ssl=False)
-
-        with self.assertRaises(TypeError):
-            Config(app_id=u'4', key=4, secret=u'secret', ssl=False)
-
-        with self.assertRaises(TypeError):
-            Config(app_id=u'4', key=b'key', secret=u'secret', ssl=False)
+        self.assertRaises(TypeError, lambda: Config(app_id=u'4', secret=u'secret', ssl=False))
+        self.assertRaises(TypeError, lambda: Config(app_id=u'4', key=4, secret=u'secret', ssl=False))
+        self.assertRaises(TypeError, lambda: Config(app_id=u'4', key=b'key', secret=u'secret', ssl=False))
 
     def test_secret_should_be_text(self):
-        with self.assertRaises(TypeError):
-            Config(app_id=u'4', key=u'key', secret=4, ssl=False)
-
-        with self.assertRaises(TypeError):
-            Config(app_id=u'4', key=u'key', secret=b'secret', ssl=False)
+        self.assertRaises(TypeError, lambda: Config(app_id=u'4', key=u'key', secret=4, ssl=False))
+        self.assertRaises(TypeError, lambda: Config(app_id=u'4', key=u'key', secret=b'secret', ssl=False))
 
     def test_ssl_should_be_required(self):
-        with self.assertRaises(TypeError):
-            Config(app_id=u'4', key=u'key', secret=b'secret')
+        self.assertRaises(TypeError, lambda: Config(app_id=u'4', key=u'key', secret=b'secret'))
 
     def test_ssl_should_be_boolean(self):
         Config(app_id=u'4', key=u'key', secret=u'secret', ssl=False)
         Config(app_id=u'4', key=u'key', secret=u'secret', ssl=True)
 
-        with self.assertRaises(TypeError):
-            Config(app_id=u'4', key=u'key', secret=u'secret', ssl=4)
+        self.assertRaises(TypeError, lambda: Config(app_id=u'4', key=u'key', secret=u'secret', ssl=4))
 
     def test_host_should_be_text(self):
         Config(app_id=u'4', key=u'key', secret=u'secret', ssl=True, host=u'foo')
 
-        with self.assertRaises(TypeError):
-            Config(app_id=u'4', key=u'key', secret=u'secret', ssl=True, host=b'foo')
-
-        with self.assertRaises(TypeError):
-            Config(app_id=u'4', key=u'key', secret=u'secret', ssl=True, host=4)
+        self.assertRaises(TypeError, lambda: Config(app_id=u'4', key=u'key', secret=u'secret', ssl=True, host=b'foo'))
+        self.assertRaises(TypeError, lambda: Config(app_id=u'4', key=u'key', secret=u'secret', ssl=True, host=4))
 
     def test_port_should_be_number(self):
         Config(app_id=u'4', key=u'key', secret=u'secret', ssl=True, port=400)
 
-        with self.assertRaises(TypeError):
-            Config(app_id=u'4', key=u'key', secret=u'secret', ssl=True, port=u'400')
+        self.assertRaises(TypeError, lambda: Config(app_id=u'4', key=u'key', secret=u'secret', ssl=True, port=u'400'))
 
     def test_cluster_should_be_text(self):
         Config(app_id=u'4', key=u'key', secret=u'secret', ssl=True, cluster=u'eu')
 
-        with self.assertRaises(TypeError):
-            Config(app_id=u'4', key=u'key', secret=u'secret', ssl=True, cluster=b'eu')
-
-        with self.assertRaises(TypeError):
-            Config(app_id=u'4', key=u'key', secret=u'secret', ssl=True, cluster=4)
+        self.assertRaises(TypeError, lambda: Config(app_id=u'4', key=u'key', secret=u'secret', ssl=True, cluster=b'eu'))
+        self.assertRaises(TypeError, lambda: Config(app_id=u'4', key=u'key', secret=u'secret', ssl=True, cluster=4))
 
     def test_host_behaviour(self):
         conf = Config(app_id=u'4', key=u'key', secret=u'secret', ssl=True)
@@ -105,14 +83,9 @@ def test_port_behaviour(self):
         self.assertEqual(conf.port, 4000, u'the port setting override the default')
 
     def test_initialize_from_url(self):
-        with self.assertRaises(TypeError):
-            Config.from_url(4)
-
-        with self.assertRaises(TypeError):
-            Config.from_url(b'http://foo:bar@host/apps/4')
-
-        with self.assertRaises(Exception):
-            Config.from_url(u'httpsahsutaeh')
+        self.assertRaises(TypeError, lambda: Config.from_url(4))
+        self.assertRaises(TypeError, lambda: Config.from_url(b'http://foo:bar@host/apps/4'))
+        self.assertRaises(Exception, lambda: Config.from_url(u'httpsahsutaeh'))
 
         conf = Config.from_url(u'http://foo:bar@host/apps/4')
         self.assertEqual(conf.ssl, False)
@@ -148,14 +121,9 @@ def test_initialize_from_env(self):
     def test_authenticate_subscription_types(self):
         conf = Config.from_url(u'http://foo:bar@host/apps/4')
 
-        with self.assertRaises(TypeError):
-            conf.authenticate_subscription(b'plah', u'34554')
-
-        with self.assertRaises(TypeError):
-            conf.authenticate_subscription(u'plah', b'324435')
-
-        with self.assertRaises(ValueError):
-            conf.authenticate_subscription(u'::', u'345345')
+        self.assertRaises(TypeError, lambda: conf.authenticate_subscription(b'plah', u'34554'))
+        self.assertRaises(TypeError, lambda: conf.authenticate_subscription(u'plah', b'324435'))
+        self.assertRaises(ValueError, lambda: conf.authenticate_subscription(u'::', u'345345'))
 
     def test_authenticate_subscription_for_private_channels(self):
         conf = Config.from_url(u'http://foo:bar@host/apps/4')
@@ -205,23 +173,12 @@ def test_validate_webhook_bad_types(self):
         # sensible.
 
         with mock.patch('time.time') as time_mock:
-            with self.assertRaises(TypeError):
-                conf.validate_webhook(4, u'signature', u'body')
-
-            with self.assertRaises(TypeError):
-                conf.validate_webhook(b'test', u'signature', u'body')
-
-            with self.assertRaises(TypeError):
-                conf.validate_webhook(u'key', 4, u'body')
-
-            with self.assertRaises(TypeError):
-                conf.validate_webhook(u'key', b'signature', u'body')
-
-            with self.assertRaises(TypeError):
-                conf.validate_webhook(u'key', u'signature', 4)
-
-            with self.assertRaises(TypeError):
-                conf.validate_webhook(u'key', u'signature', b'body')
+            self.assertRaises(TypeError, lambda: conf.validate_webhook(4, u'signature', u'body'))
+            self.assertRaises(TypeError, lambda: conf.validate_webhook(b'test', u'signature', u'body'))
+            self.assertRaises(TypeError, lambda: conf.validate_webhook(u'key', 4, u'body'))
+            self.assertRaises(TypeError, lambda: conf.validate_webhook(u'key', b'signature', u'body'))
+            self.assertRaises(TypeError, lambda: conf.validate_webhook(u'key', u'signature', 4))
+            self.assertRaises(TypeError, lambda: conf.validate_webhook(u'key', u'signature', b'body'))
 
         time_mock.assert_not_called()
 
@@ -251,7 +208,7 @@ def test_validate_webhook_bad_time(self):
         conf = Config.from_url(u'http://foo:bar@host/apps/4')
 
         body = u'{"time_ms": 1000000}'
-        signature = six.text_type(hmac.new(conf.secret.encode(u'utf8'), body.encode(u'utf8'), hashlib.sha256).hexdigest())
+        signature = six.text_type(hmac.new(conf.secret.encode('utf8'), body.encode('utf8'), hashlib.sha256).hexdigest())
 
         with mock.patch('time.time', return_value=1301):
             self.assertEqual(conf.validate_webhook(conf.key, signature, body), None)

pusher_tests/test_pusher.py

@@ -36,12 +36,12 @@ def test_trigger_success_case(self):
         json_dumps_mock.assert_called_once({u'message': u'hello world'})
 
     def test_trigger_disallow_single_channel(self):
-        with self.assertRaises(TypeError):
-            self.pusher.trigger.make_request(u'some_channel', u'some_event', {u'message': u'hello world'})
+        self.assertRaises(TypeError, lambda:
+            self.pusher.trigger.make_request(u'some_channel', u'some_event', {u'message': u'hello world'}))
 
     def test_trigger_disallow_invalid_channels(self):
-        with self.assertRaises(ValueError):
-            self.pusher.trigger.make_request([u'some_channel!'], u'some_event', {u'message': u'hello world'})
+        self.assertRaises(ValueError, lambda:
+            self.pusher.trigger.make_request([u'some_channel!'], u'some_event', {u'message': u'hello world'}))
 
     def test_channels_info_default_success_case(self):
         request = self.pusher.channels_info.make_request()