8000 Make it shiny! ... and fix failed test ;) · bonomali/server-client-python@d5bd7c8 · GitHub
[go: up one dir, main page]
Skip to content

Commit d5bd7c8

Browse files
gaoang2148gaoang2148
committed
Make it shiny! ... and fix failed test ;)
1 parent 1fcdc12 commit d5bd7c8

File tree

3 files changed

+29
-10
lines changed

3 files changed

+29
-10
lines changed

‎samples/publish_workbook.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ def main():
5555
if default_project is not None:
5656
new_workbook = TSC.WorkbookItem(default_project.id)
5757
if args.as_job:
58-
new_job = server.workbooks.publish(new_workbook, args.filepath, overwrite_true, args.as_job)
58+
new_job = server.workbooks.publish(new_workbook, args.filepath, overwrite_true, as_job=args.as_job)
5959
print("Workbook published. JOB ID: {0}".format(new_job.id))
6060
else:
61-
new_workbook = server.workbooks.publish(new_workbook, args.filepath, overwrite_true, args.as_job)
61+
new_workbook = server.workbooks.publish(new_workbook, args.filepath, overwrite_true, as_job=args.as_job)
6262
print("Workbook published. ID: {0}".format(new_workbook.id))
6363
else:
6464
error = "The default project could not be found."

‎test/test_datasource.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,11 @@ def test_publish(self):
173173
with requests_mock.mock() as m:
174174
m.post(self.baseurl, text=response_xml)
175175
new_datasource = TSC.DatasourceItem('SampleDS', 'ee8c6e70-43b6-11e6-af4f-f7b0d8e20760')
176+
publish_mode = self.server.PublishMode.CreateNew
177+
176178
new_datasource = self.server.datasources.publish(new_datasource,
177179
asset('SampleDS.tds'),
178-
mode=self.server.PublishMode.CreateNew)
180+
mode=publish_mode)
179181

180182
self.assertEqual('e76a1461-3b1d-4588-bf1b-17551a879ad9', new_datasource.id)
181183
self.assertEqual('SampleDS', new_datasource.name)
@@ -192,9 +194,11 @@ def test_publish_async(self):
192194
with requests_mock.mock() as m:
193195
m.post(self.baseurl, text=response_xml)
194196
new_datasource = TSC.DatasourceItem('SampleDS', 'ee8c6e70-43b6-11e6-af4f-f7b0d8e20760')
197+
publish_mode = self.server.PublishMode.CreateNew
198+
195199
new_job = self.server.datasources.publish(new_datasource,
196200
asset('SampleDS.tds'),
197-
mode=self.server.PublishMode.CreateNew,
201+
mode=publish_mode,
198202
as_job=True)
199203

200204
self.assertEqual('9a373058-af5f-4f83-8662-98b3e0228a73', new_job.id)

‎test/test_workbook.py

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -286,10 +286,17 @@ def test_publish(self):
286286
response_xml = f.read().decode('utf-8')
287287
with requests_mock.mock() as m:
288288
m.post(self.baseurl, text=response_xml)
289-
new_workbook = TSC.WorkbookItem(name='Sample', show_tabs=False,
289+
290+
new_workbook = TSC.WorkbookItem(name='Sample',
291+
show_tabs=False,
290292
project_id='ee8c6e70-43b6-11e6-af4f-f7b0d8e20760')
291-
new_workbook = self.server.workbooks.publish(new_workbook, os.path.join(TEST_ASSET_DIR, 'SampleWB.twbx'),
292-
self.server.PublishMode.CreateNew)
293+
294+
sample_workbok = os.path.join(TEST_ASSET_DIR, 'SampleWB.twbx')
295+
publish_mode = self.server.PublishMode.CreateNew
296+
297+
new_workbook = self.server.workbooks.publish(new_workbook,
298+
sample_workbok,
299+
publish_mode)
293300

294301
self.assertEqual('a8076ca1-e9d8-495e-bae6-c684dbb55836', new_workbook.id)
295302
self.assertEqual('RESTAPISample', new_workbook.name)
@@ -310,10 +317,18 @@ def test_publish_async(self):
310317
response_xml = f.read().decode('utf-8')
311318
with requests_mock.mock() as m:
312319
m.post(self.baseurl, text=response_xml)
313-
new_workbook = TSC.WorkbookItem(name='Sample', show_tabs=False,
320+
321+
new_workbook = TSC.WorkbookItem(name='Sample',
322+
show_tabs=False,
314323
project_id='ee8c6e70-43b6-11e6-af4f-f7b0d8e20760')
315-
new_job = self.server.workbooks.publish(new_workbook, os.path.join(TEST_ASSET_DIR, 'SampleWB.twbx'),
316-
self.server.PublishMode.CreateNew, True)
324+
325+
sample_workbok = os.path.join(TEST_ASSET_DIR, 'SampleWB.twbx')
326+
publish_mode = self.server.PublishMode.CreateNew
327+
328+
new_job = self.server.workbooks.publish(new_workbook,
329+
sample_workbok,
330+
publish_mode,
331+
as_job=True)
317332

318333
self.assertEqual('7c3d599e-949f-44c3-94a1-f30ba85757e4', new_job.id)
319334
self.assertEqual('PublishWorkbook', new_job.type)

0 commit comments

Comments
 (0)
0