Make it shiny! ... and fix failed test ;)

gaoang2148 · gaoang2148 · commit d5bd7c888f8e · 2018-07-03T19:32:19.000-07:00
diff --git a/samples/publish_workbook.py b/samples/publish_workbook.py
@@ -55,10 +55,10 @@ def main():
         if default_project is not None:
             new_workbook = TSC.WorkbookItem(default_project.id)
             if args.as_job:
-                new_job = server.workbooks.publish(new_workbook, args.filepath, overwrite_true, args.as_job)
+                new_job = server.workbooks.publish(new_workbook, args.filepath, overwrite_true, as_job=args.as_job)
                 print("Workbook published. JOB ID: {0}".format(new_job.id))
             else:
-                new_workbook = server.workbooks.publish(new_workbook, args.filepath, overwrite_true, args.as_job)
+                new_workbook = server.workbooks.publish(new_workbook, args.filepath, overwrite_true, as_job=args.as_job)
                 print("Workbook published. ID: {0}".format(new_workbook.id))
         else:
             error = "The default project could not be found."
diff --git a/test/test_datasource.py b/test/test_datasource.py
@@ -173,9 +173,11 @@ def test_publish(self):
         with requests_mock.mock() as m:
             m.post(self.baseurl, text=response_xml)
             new_datasource = TSC.DatasourceItem('SampleDS', 'ee8c6e70-43b6-11e6-af4f-f7b0d8e20760')
+            publish_mode = self.server.PublishMode.CreateNew
+
             new_datasource = self.server.datasources.publish(new_datasource,
                                                              asset('SampleDS.tds'),
-                                                             mode=self.server.PublishMode.CreateNew)
+                                                             mode=publish_mode)
 
         self.assertEqual('e76a1461-3b1d-4588-bf1b-17551a879ad9', new_datasource.id)
         self.assertEqual('SampleDS', new_datasource.name)
@@ -192,9 +194,11 @@ def test_publish_async(self):
         with requests_mock.mock() as m:
             m.post(self.baseurl, text=response_xml)
             new_datasource = TSC.DatasourceItem('SampleDS', 'ee8c6e70-43b6-11e6-af4f-f7b0d8e20760')
+            publish_mode = self.server.PublishMode.CreateNew
+
             new_job = self.server.datasources.publish(new_datasource,
                                                       asset('SampleDS.tds'),
-                                                      mode=self.server.PublishMode.CreateNew,
+                                                      mode=publish_mode,
                                                       as_job=True)
 
         self.assertEqual('9a373058-af5f-4f83-8662-98b3e0228a73', new_job.id)
diff --git a/test/test_workbook.py b/test/test_workbook.py
@@ -286,10 +286,17 @@ def test_publish(self):
             response_xml = f.read().decode('utf-8')
         with requests_mock.mock() as m:
             m.post(self.baseurl, text=response_xml)
-            new_workbook = TSC.WorkbookItem(name='Sample', show_tabs=False,
+
+            new_workbook = TSC.WorkbookItem(name='Sample',
+                                            show_tabs=False,
                                             project_id='ee8c6e70-43b6-11e6-af4f-f7b0d8e20760')
-            new_workbook = self.server.workbooks.publish(new_workbook, os.path.join(TEST_ASSET_DIR, 'SampleWB.twbx'),
-                                                         self.server.PublishMode.CreateNew)
+
+            sample_workbok = os.path.join(TEST_ASSET_DIR, 'SampleWB.twbx')
+            publish_mode = self.server.PublishMode.CreateNew
+
+            new_workbook = self.server.workbooks.publish(new_workbook,
+                                                         sample_workbok,
+                                                         publish_mode)
 
         self.assertEqual('a8076ca1-e9d8-495e-bae6-c684dbb55836', new_workbook.id)
         self.assertEqual('RESTAPISample', new_workbook.name)
@@ -310,10 +317,18 @@ def test_publish_async(self):
             response_xml = f.read().decode('utf-8')
         with requests_mock.mock() as m:
             m.post(self.baseurl, text=response_xml)
-            new_workbook = TSC.WorkbookItem(name='Sample', show_tabs=False,
+
+            new_workbook = TSC.WorkbookItem(name='Sample',
+                                            show_tabs=False,
                                             project_id='ee8c6e70-43b6-11e6-af4f-f7b0d8e20760')
-            new_job = self.server.workbooks.publish(new_workbook, os.path.join(TEST_ASSET_DIR, 'SampleWB.twbx'),
-                                                    self.server.PublishMode.CreateNew, True)
+
+            sample_workbok = os.path.join(TEST_ASSET_DIR, 'SampleWB.twbx')
+            publish_mode = self.server.PublishMode.CreateNew
+
+            new_job = self.server.workbooks.publish(new_workbook,
+                                                    sample_workbok,
+                                                    publish_mode,
+                                                    as_job=True)
 
         self.assertEqual('7c3d599e-949f-44c3-94a1-f30ba85757e4', new_job.id)
         self.assertEqual('PublishWorkbook', new_job.type)
