Simple assertions in setUpClass

Eldinnie · Eldinnie · commit e7b839b69e9e · 2017-06-21T16:50:40.000+02:00
Py2 does not implement TestCase's assertions until setUp() is done. Hence we need simple assertions in the setUpClass
diff --git a/tests/test_video.py b/tests/test_video.py
@@ -45,9 +45,10 @@ def setUpClass(cls):
         cls.video = video
 
         # Make sure file has been uploaded.
-        cls.assertIsInstance(cls(), cls.video, telegram.Video)
-        cls.assertIsInstance(cls(), cls.video.file_id, str)
-        cls.assertNotEqual(cls(), cls.video.file_id, '')
+        # Simple assertions PY2 Only
+        assert isinstance(cls.video, telegram.Video)
+        assert isinstance(cls.video.file_id, str)
+        assert cls.video.file_id is not ''
 
     def setUp(self):
         self.video_file = open('tests/data/telegram.mp4', 'rb')
diff --git a/tests/test_videonote.py b/tests/test_videonote.py
@@ -42,9 +42,10 @@ def setUpClass(cls):
         cls.videonote = video_note
 
         # Make sure file has been uploaded.
-        cls.assertIsInstance(cls(), cls.videonote, telegram.VideoNote)
-        cls.assertIsInstance(cls(), cls.videonote.file_id, str)
-        cls.assertNotEqual(cls(), cls.videonote.file_id, '')
+        # Simple assertions PY2 Only
+        assert isinstance(cls.videonote, telegram.VideoNote)
+        assert isinstance(cls.videonote.file_id, str)
+        assert cls.videonote.file_id is not ''
 
     def setUp(self):
         self.videonote_file = open('tests/data/telegram2.mp4', 'rb')
diff --git a/tests/test_voice.py b/tests/test_voice.py
@@ -45,9 +45,10 @@ def setUpClass(cls):
         cls.voice = voice
 
         # Make sure file has been uploaded.
-        cls.assertIsInstance(cls(), cls.voice, telegram.Voice)
-        cls.assertIsInstance(cls(), cls.voice.file_id, str)
-        cls.assertNotEqual(cls(), cls.voice.file_id, '')
+        # Simple assertions PY2 Only
+        assert isinstance(cls.voice, telegram.Voice)
+        assert isinstance(cls.voice.file_id, str)
+        assert cls.voice.file_id is not ''
 
     def setUp(self):
         self.voice_file = open('tests/data/telegram.ogg', 'rb')
