Adding tests for 500 error handling (#364)

shinchris · web-flow · commit fe2ff8f2175d · 2019-04-02T14:39:34.000-07:00
* Adding tests for 500 error handling

* fixing python 2.7 test failures

* fixing style failure
diff --git a/test/test_datasource.py b/test/test_datasource.py
@@ -4,6 +4,7 @@
 import xml.etree.ElementTree as ET
 import tableauserverclient as TSC
 from tableauserverclient.datetime_helpers import format_datetime
+from tableauserverclient.server.endpoint.exceptions import InternalServerError
 from tableauserverclient.server.request_factory import RequestFactory
 from ._utils import read_xml_asset, read_xml_assets, asset
 
@@ -313,3 +314,14 @@ def test_credentials_and_multi_connect_raises_exception(self):
             response = RequestFactory.Datasource._generate_xml(new_datasource,
                                                                connection_credentials=connection_creds,
                                                                connections=[connection1])
+
+    def test_synchronous_publish_timeout_error(self):
+        with requests_mock.mock() as m:
+            m.register_uri('POST', self.baseurl, status_code=504)
+
+            new_datasource = TSC.DatasourceItem(project_id='')
+            publish_mode = self.server.PublishMode.CreateNew
+
+            self.assertRaisesRegexp(InternalServerError, 'Please use asynchronous publishing to avoid timeouts.',
+                                    self.server.datasources.publish, new_datasource,
+                                    asset('SampleDS.tds'), publish_mode)
diff --git a/test/test_requests.py b/test/test_requests.py
@@ -5,6 +5,8 @@
 
 import tableauserverclient as TSC
 
+from tableauserverclient.server.endpoint.exceptions import InternalServerError
+
 
 class RequestTests(unittest.TestCase):
     def setUp(self):
@@ -45,3 +47,11 @@ def test_make_post_request(self):
             self.assertEqual(resp.request.headers['x-tableau-auth'], 'j80k54ll2lfMZ0tv97mlPvvSCRyD0DOM')
             self.assertEqual(resp.request.headers['content-type'], 'multipart/mixed')
             self.assertEqual(resp.request.body, b'1337')
+
+    # Test that 500 server errors are handled properly
+    def test_internal_server_error(self):
+        self.server.version = "3.2"
+        server_response = "500: Internal Server Error"
+        with requests_mock.mock() as m:
+            m.register_uri('GET', self.server.server_info.baseurl, status_code=500, text=server_response)
+            self.assertRaisesRegexp(InternalServerError, server_response, self.server.server_info.get)
diff --git a/test/test_workbook.py b/test/test_workbook.py
@@ -5,7 +5,9 @@
 import xml.etree.ElementTree as ET
 
 from tableauserverclient.datetime_helpers import format_datetime
+from tableauserverclient.server.endpoint.exceptions import InternalServerError
 from tableauserverclient.server.request_factory import RequestFactory
+from ._utils import asset
 
 TEST_ASSET_DIR = os.path.join(os.path.dirname(__file__), 'assets')
 
@@ -319,11 +321,11 @@ def test_publish(self):
                                             show_tabs=False,
                                             project_id='ee8c6e70-43b6-11e6-af4f-f7b0d8e20760')
 
-            sample_workbok = os.path.join(TEST_ASSET_DIR, 'SampleWB.twbx')
+            sample_workbook = os.path.join(TEST_ASSET_DIR, 'SampleWB.twbx')
             publish_mode = self.server.PublishMode.CreateNew
 
             new_workbook = self.server.workbooks.publish(new_workbook,
-                                                         sample_workbok,
+                                                         sample_workbook,
                                                          publish_mode)
 
         self.assertEqual('a8076ca1-e9d8-495e-bae6-c684dbb55836', new_workbook.id)
@@ -350,11 +352,11 @@ def test_publish_async(self):
                                             show_tabs=False,
                                             project_id='ee8c6e70-43b6-11e6-af4f-f7b0d8e20760')
 
-            sample_workbok = os.path.join(TEST_ASSET_DIR, 'SampleWB.twbx')
+            sample_workbook = os.path.join(TEST_ASSET_DIR, 'SampleWB.twbx')
             publish_mode = self.server.PublishMode.CreateNew
 
             new_job = self.server.workbooks.publish(new_workbook,
-                                                    sample_workbok,
+                                                    sample_workbook,
                                                     publish_mode,
                                                     as_job=True)
 
@@ -421,3 +423,13 @@ def test_credentials_and_multi_connect_raises_exception(self):
             response = RequestFactory.Workbook._generate_xml(new_workbook,
                                                              connection_credentials=connection_creds,
                                                              connections=[connection1])
+
+    def test_synchronous_publish_timeout_error(self):
+        with requests_mock.mock() as m:
+            m.register_uri('POST', self.baseurl, status_code=504)
+
+            new_workbook = TSC.WorkbookItem(project_id='')
+            publish_mode = self.server.PublishMode.CreateNew
+
+            self.assertRaisesRegexp(InternalServerError, 'Please use asynchronous publishing to avoid timeouts',
+                                    self.server.workbooks.publish, new_workbook, asset('SampleWB.twbx'), publish_mode)
