Merge branch 'dev' into dev_ci_integ

tableau · Apr 24, 2019 · 55e6a26 · 55e6a26
2 parents 048fbc2 + 083d533
commit 55e6a26
Showing 1 changed file with 19 additions and 40 deletions.
diff --git a/tests/unit/tools_tests/test_rest.py b/tests/unit/tools_tests/test_rest.py
@@ -46,23 +46,19 @@ def test_GET(self):
             timeout=None,
             auth=None)
 
+    @unittest.expectedFailure
     def test_GET_InvalidData(self):
         url = 'abc'
         data = {'cat'}
-        try:
-            self.assertEqual(self.rnw.GET(url, data), 'json')
-        except Exception:  # TODO: refactor this...
-            e = sys.exc_info()[0]
-            self.assertEquals(e, TypeError)
+        with self.assertRaises(TypeError):
+            self.rnw.GET(url, data)
 
+    @unittest.expectedFailure
     def test_GET_InvalidURL(self):
         url = ''
         data = {'foo': 'bar'}
-        try:
-            self.assertEqual(self.rnw.GET(url, data), 'json')
-        except Exception:  # TODO: refactor this...
-            e = sys.exc_info()[0]
-            self.assertEquals(e, TypeError)
+        with self.assertRaises(TypeError):
+            self.rnw.GET(url, data)
 
     def test_POST(self):
         url = 'abc'
@@ -74,23 +70,18 @@ def test_POST(self):
             timeout=None,
             auth=None)
 
+    @unittest.expectedFailure
     def test_POST_InvalidURL(self):
         url = ''
         data = {'foo': 'bar'}
-        try:
-            self.assertEqual(self.rnw.POST(url, data), 'json')
-        except Exception:  # TODO: refactor this...
-            e = sys.exc_info()[0]
-            self.assertEqual(e, TypeError)
+        with self.assertRaises(TypeError):
+            self.rnw.POST(url, data)
 
     def test_POST_InvalidData(self):
         url = 'url'
         data = {'cat'}
-        try:
-            self.assertEqual(self.rnw.POST(url, data), 'json')
-        except Exception:  # TODO: refactor this...
-            e = sys.exc_info()[0]
-            self.assertEqual(e, TypeError)
+        with self.assertRaises(TypeError):
+            self.rnw.POST(url, data)
 
     def test_PUT(self):
         url = 'abc'
@@ -106,20 +97,14 @@ def test_PUT(self):
     def test_PUT_InvalidData(self):
         url = 'url'
         data = {'cat'}
-        try:
-            self.assertEqual(self.rnw.PUT(url, data), 'json')
-        except Exception:  # TODO: refactor this...
-            e = sys.exc_info()[0]
-            self.assertEqual(e, TypeError)
+        with self.assertRaises(TypeError):
+            self.rnw.PUT(url, data)
 
     def test_PUT_InvalidURL(self):
         url = ''
         data = {'foo:bar'}
-        try:
-            self.assertEqual(self.rnw.PUT(url, data), 'json')
-        except Exception:  # TODO: refactor this...
-            e = sys.exc_info()[0]
-            self.assertEqual(e, TypeError)
+        with self.assertRaises(TypeError):
+            self.rnw.PUT(url, data)
 
     def test_DELETE(self):
         url = 'abc'
@@ -134,20 +119,14 @@ def test_DELETE(self):
     def test_DELETE_InvalidData(self):
         url = 'abc'
         data = {'cat'}
-        try:
-            self.assertEqual(self.rnw.DELETE(url, data), 'json')
-        except Exception:  # TODO: refactor this...
-            e = sys.exc_info()[0]
-            self.assertEqual(e, TypeError)
+        with self.assertRaises(TypeError):
+            self.rnw.DELETE(url, data)
 
     def test_DELETE_InvalidURL(self):
         url = ''
         data = {'foo:bar'}
-        try:
-            self.assertEqual(self.rnw.DELETE(url, data), 'json')
-        except Exception:  # TODO: refactor this...
-            e = sys.exc_info()[0]
-            self.assertEqual(e, TypeError)
+        with self.assertRaises(TypeError):
+            self.rnw.DELETE(url, data)
 
     def test_set_credentials(self):
         expected_auth = None