Fix merge conflict markers and missing imports in tests

- Resolved remaining conflict markers in test_datasource.py and test_workbook.py
- Added missing imports for read_xml_assets and asset from _utils
- All black formatting checks now pass
- All mypy type checks now pass

These fixes ensure CI passes on macOS, Ubuntu, and Windows.

Author: vchavatapalli

test/test_datasource.py

@@ -16,6 +16,7 @@
 from tableauserverclient.server.endpoint.exceptions import InternalServerError
 from tableauserverclient.server.endpoint.fileuploads_endpoint import Fileuploads
 from tableauserverclient.server.request_factory import RequestFactory
+from ._utils import asset, read_xml_asset, read_xml_assets
 
 TEST_ASSET_DIR = Path(__file__).parent / "assets"
 
@@ -160,8 +161,6 @@ def test_update_copy_fields(server) -> None:
     assert single_datasource.tags == updated_datasource.tags
     assert single_datasource._project_name == updated_datasource._project_name
 
-
-<<<<<<< HEAD
     def test_update_connections(self) -> None:
         populate_xml, response_xml = read_xml_assets(POPULATE_CONNECTIONS_XML, UPDATE_CONNECTIONS_XML)
 
@@ -243,7 +242,8 @@ def test_populate_permissions(self) -> None:
             m.get(self.baseurl + "/0448d2ed-590d-4fa0-b272-a2a8a24555b5/permissions", text=response_xml)
             single_datasource = TSC.DatasourceItem("1d0304cd-3796-429f-b815-7258370b9b74", "test")
             single_datasource._id = "0448d2ed-590d-4fa0-b272-a2a8a24555b5"
-=======
+
+
 def test_update_tags(server) -> None:
     add_tags_xml = ADD_TAGS_XML.read_text()
     update_xml = UPDATE_XML.read_text()
@@ -257,7 +257,6 @@ def test_update_tags(server) -> None:
         single_datasource._initial_tags.update(["a", "b", "c", "d"])
         single_datasource.tags.update(["a", "c", "e"])
         updated_datasource = server.datasources.update(single_datasource)
->>>>>>> d4b27f42d897883f8b8d0cb5b7edb558df2cbfb6
 
     assert single_datasource.tags == updated_datasource.tags
     assert single_datasource._initial_tags == updated_datasource._initial_tags

test/test_workbook.py

@@ -13,6 +13,7 @@
 from tableauserverclient.models import UserItem, GroupItem, PermissionsRule
 from tableauserverclient.server.endpoint.exceptions import InternalServerError, UnsupportedAttributeError
 from tableauserverclient.server.request_factory import RequestFactory
+from ._utils import asset, read_xml_asset, read_xml_assets
 
 TEST_ASSET_DIR = Path(__file__).parent / "assets"
 
@@ -707,8 +708,6 @@ def test_publish_with_thumbnails_user_id(server: TSC.Server) -> None:
         # order of attributes in xml is unspecified
         assert re.search(b'thumbnailsUserId=\\"ee8c6e70-43b6-11e6-af4f-f7b0d8e20761\\"', request_body)
 
-
-<<<<<<< HEAD
     def test_update_workbook_connections(self) -> None:
         populate_xml, response_xml = read_xml_assets(POPULATE_CONNECTIONS_XML, UPDATE_CONNECTIONS_XML)
 
@@ -778,12 +777,12 @@ def test_update_workbook_connections_without_auth_type(self) -> None:
     def test_get_workbook_all_fields(self) -> None:
         self.server.version = "3.21"
         baseurl = self.server.workbooks.baseurl
-=======
+
+
 def test_publish_with_thumbnails_group_id(server: TSC.Server) -> None:
     response_xml = PUBLISH_XML.read_text()
     with requests_mock.mock() as m:
         m.post(server.workbooks.baseurl, text=response_xml)
->>>>>>> d4b27f42d897883f8b8d0cb5b7edb558df2cbfb6
 
         new_workbook = TSC.WorkbookItem(
             name="Sample",