Skip to content

Commit b46825e

Browse files
committed
Merge branch 'jac/fix-test-baseurl-outside-mock' into jac/fix-stop-iteration
2 parents 922d20f + 18ceb6e commit b46825e

1 file changed

Lines changed: 0 additions & 14 deletions

File tree

test/test_workbook.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ def test_get_by_id_missing_id(server: TSC.Server) -> None:
169169

170170
def test_refresh_id(server: TSC.Server) -> None:
171171
server.version = "2.8"
172-
server.workbooks.baseurl
173172
response_xml = REFRESH_XML.read_text()
174173
with requests_mock.mock() as m:
175174
m.post(
@@ -182,7 +181,6 @@ def test_refresh_id(server: TSC.Server) -> None:
182181

183182
def test_refresh_already_running(server: TSC.Server) -> None:
184183
server.version = "2.8"
185-
server.workbooks.baseurl
186184
response_xml = WORKBOOK_REFRESH_DUPLICATE_XML.read_text()
187185
with requests_mock.mock() as m:
188186
m.post(
@@ -196,7 +194,6 @@ def test_refresh_already_running(server: TSC.Server) -> None:
196194

197195
def test_refresh_object(server: TSC.Server) -> None:
198196
server.version = "2.8"
199-
server.workbooks.baseurl
200197
workbook = TSC.WorkbookItem("")
201198
workbook._id = "3cc6cd06-89ce-4fdc-b935-5294135d6d42"
202199
response_xml = REFRESH_XML.read_text()
@@ -326,7 +323,6 @@ def test_download_sanitizes_name(server: TSC.Server) -> None:
326323
def test_download_extract_only(server: TSC.Server) -> None:
327324
# Pretend we're 2.5 for 'extract_only'
328325
server.version = "2.5"
329-
server.workbooks.baseurl
330326

331327
with requests_mock.mock() as m:
332328
m.get(
@@ -467,7 +463,6 @@ def test_populate_connections_missing_id(server: TSC.Server) -> None:
467463

468464
def test_populate_pdf(server: TSC.Server) -> None:
469465
server.version = "3.4"
470-
server.workbooks.baseurl
471466
response = POPULATE_PDF.read_bytes()
472467
with requests_mock.mock() as m:
473468
m.get(
@@ -487,7 +482,6 @@ def test_populate_pdf(server: TSC.Server) -> None:
487482

488483
def test_populate_pdf_unsupported(server: TSC.Server) -> None:
489484
server.version = "3.4"
490-
server.workbooks.baseurl
491485
with requests_mock.mock() as m:
492486
m.get(
493487
server.workbooks.baseurl + "/1f951daf-4061-451a-9df1-69a8062664f2/pdf?type=a5&orientation=landscape",
@@ -507,7 +501,6 @@ def test_populate_pdf_unsupported(server: TSC.Server) -> None:
507501

508502
def test_populate_pdf_vf_dims(server: TSC.Server) -> None:
509503
server.version = "3.23"
510-
server.workbooks.baseurl
511504
response = POPULATE_PDF.read_bytes()
512505
with requests_mock.mock() as m:
513506
m.get(
@@ -531,7 +524,6 @@ def test_populate_pdf_vf_dims(server: TSC.Server) -> None:
531524

532525
def test_populate_powerpoint(server: TSC.Server) -> None:
533526
server.version = "3.8"
534-
server.workbooks.baseurl
535527
response = POPULATE_POWERPOINT.read_bytes()
536528
with requests_mock.mock() as m:
537529
m.get(server.workbooks.baseurl + "/1f951daf-4061-451a-9df1-69a8062664f2/powerpoint?maxAge=1", content=response)
@@ -881,7 +873,6 @@ def test_synchronous_publish_timeout_error(server: TSC.Server) -> None:
881873

882874
def test_delete_extracts_all(server: TSC.Server) -> None:
883875
server.version = "3.10"
884-
server.workbooks.baseurl
885876

886877
response_xml = PUBLISH_ASYNC_XML.read_text()
887878
with requests_mock.mock() as m:
@@ -895,7 +886,6 @@ def test_delete_extracts_all(server: TSC.Server) -> None:
895886

896887
def test_create_extracts_all(server: TSC.Server) -> None:
897888
server.version = "3.10"
898-
server.workbooks.baseurl
899889

900890
response_xml = PUBLISH_ASYNC_XML.read_text()
901891
with requests_mock.mock() as m:
@@ -909,7 +899,6 @@ def test_create_extracts_all(server: TSC.Server) -> None:
909899

910900
def test_create_extracts_one(server: TSC.Server) -> None:
911901
server.version = "3.10"
912-
server.workbooks.baseurl
913902

914903
datasource = TSC.DatasourceItem("test")
915904
datasource._id = "1f951daf-4061-451a-9df1-69a8062664f2"
@@ -925,7 +914,6 @@ def test_create_extracts_one(server: TSC.Server) -> None:
925914

926915

927916
def test_revisions(server: TSC.Server) -> None:
928-
server.workbooks.baseurl
929917
workbook = TSC.WorkbookItem("project", "test")
930918
workbook._id = "06b944d2-959d-4604-9305-12323c95e70e"
931919

@@ -956,7 +944,6 @@ def test_revisions(server: TSC.Server) -> None:
956944

957945

958946
def test_delete_revision(server: TSC.Server) -> None:
959-
server.workbooks.baseurl
960947
workbook = TSC.WorkbookItem("project", "test")
961948
workbook._id = "06b944d2-959d-4604-9305-12323c95e70e"
962949

@@ -986,7 +973,6 @@ def test_bad_download_response(server: TSC.Server) -> None:
986973

987974

988975
def test_odata_connection(server: TSC.Server) -> None:
989-
server.workbooks.baseurl
990976
workbook = TSC.WorkbookItem("project", "test")
991977
workbook._id = "06b944d2-959d-4604-9305-12323c95e70e"
992978
connection = TSC.ConnectionItem()

0 commit comments

Comments
 (0)