Revert "Merge branch 'convert_windows_line_ending' into TSO"

This reverts commit 2326a40, reversing changes made to 85d84c8. Signed-off-by: pem70 <[email protected]>
zowe · Jun 7, 2024 · 3de32d1 · 3de32d1
1 parent 2326a40
commit 3de32d1
Show file tree

Hide file tree

Showing 17 changed files with 134 additions and 47 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,6 @@ All notable changes to the Zowe Client Python SDK will be documented in this fil
 
 ### Enhancements
 
-- Added logger class to core SDK [#185](https://github.com/zowe/zowe-client-python-sdk/issues/185)
 - Added logger class to core SDK [#185](https://github.com/zowe/zowe-client-python-sdk/issues/185)
 - Added classes for handling `Datasets`, `USSFiles`, and `FileSystems` in favor of the single Files class. [#264](https://github.com/zowe/zowe-client-python-sdk/issues/264)
 - Refactored testings into proper folders and files and add more tests [#265](https://github.com/zowe/zowe-client-python-sdk/issues/265)

diff --git a/src/zos_files/zowe/zos_files_for_zowe_sdk/uss.py b/src/zos_files/zowe/zos_files_for_zowe_sdk/uss.py
@@ -125,6 +125,7 @@ def get_content(self, filepath_name):
             A JSON with the contents of the specified USS file
         """
         custom_args = self._create_custom_request_arguments()
+        # custom_args["params"] = {"filepath-name": filepath_name}
         custom_args["url"] = "{}fs{}".format(self.request_endpoint, filepath_name)
         response_json = self.request_handler.perform_request("GET", custom_args)
         return response_json

diff --git a/tests/unit/files/constants.py b/tests/unit/files/constants.py
diff --git a/tests/unit/files/datasets/test_copy.py b/tests/unit/files/datasets/test_copy.py
@@ -1,14 +1,21 @@
+import re
 from unittest import TestCase, mock
-from zowe.zos_files_for_zowe_sdk import Files
-from unit.files.constants import profile
+
+from zowe.zos_files_for_zowe_sdk import Files, exceptions, Datasets
 
 
 class TestCreateClass(TestCase):
     """File class unit tests."""
 
     def setUp(self):
         """Setup fixtures for File class."""
-        self.test_profile = profile
+        self.test_profile = {
+            "host": "mock-url.com",
+            "user": "Username",
+            "password": "Password",
+            "port": 443,
+            "rejectUnauthorized": True,
+        }
 
     @mock.patch("requests.Session.send")
     def test_copy_uss_to_dataset(self, mock_send_request):

diff --git a/tests/unit/files/datasets/test_create.py b/tests/unit/files/datasets/test_create.py
@@ -1,14 +1,21 @@
+import re
 from unittest import TestCase, mock
-from zowe.zos_files_for_zowe_sdk import Files
-from unit.files.constants import profile
+
+from zowe.zos_files_for_zowe_sdk import Files, exceptions, Datasets
 
 
 class TestCreateClass(TestCase):
     """File class unit tests."""
 
     def setUp(self):
         """Setup fixtures for File class."""
-        self.test_profile = profile
+        self.test_profile = {
+            "host": "mock-url.com",
+            "user": "Username",
+            "password": "Password",
+            "port": 443,
+            "rejectUnauthorized": True,
+        }
 
     @mock.patch("requests.Session.send")
     def test_create_data_set_accept_valid_recfm(self, mock_send_request):

diff --git a/tests/unit/files/datasets/test_delete.py b/tests/unit/files/datasets/test_delete.py
@@ -1,14 +1,21 @@
+import re
 from unittest import TestCase, mock
-from zowe.zos_files_for_zowe_sdk import Files
-from unit.files.constants import profile
+
+from zowe.zos_files_for_zowe_sdk import Files, exceptions, Datasets
 
 
 class TestDeleteClass(TestCase):
     """File class unit tests."""
 
     def setUp(self):
         """Setup fixtures for File class."""
-        self.test_profile = profile
+        self.test_profile = {
+            "host": "mock-url.com",
+            "user": "Username",
+            "password": "Password",
+            "port": 443,
+            "rejectUnauthorized": True,
+        }
 
     @mock.patch("requests.Session.send")
     def test_delete(self, mock_send_request):
@@ -19,7 +26,7 @@ def test_delete(self, mock_send_request):
         mock_send_request.assert_called_once()
 
     @mock.patch("requests.Session.send")
-    def test_delete_param(self, mock_send_request):
+    def test_delete_pram(self, mock_send_request):
         """Test list members sends request"""
         self.files_instance = Files(self.test_profile)
         mock_send_request.return_value = mock.Mock(headers={"Content-Type": "application/json"}, status_code=200)

diff --git a/tests/unit/files/datasets/test_get.py b/tests/unit/files/datasets/test_get.py
@@ -1,14 +1,21 @@
+import re
 from unittest import TestCase, mock
-from zowe.zos_files_for_zowe_sdk import Files
-from unit.files.constants import profile
+
+from zowe.zos_files_for_zowe_sdk import Files, exceptions, Datasets
 
 
 class TestGetClass(TestCase):
     """File class unit tests."""
 
     def setUp(self):
         """Setup fixtures for File class."""
-        self.test_profile = profile
+        self.test_profile = {
+            "host": "mock-url.com",
+            "user": "Username",
+            "password": "Password",
+            "port": 443,
+            "rejectUnauthorized": True,
+        }
 
     @mock.patch("requests.Session.send")
     def test_get(self, mock_send_request):

diff --git a/tests/unit/files/datasets/test_list.py b/tests/unit/files/datasets/test_list.py
@@ -1,14 +1,22 @@
+"""Unit tests for the Zowe Python SDK z/OS Files package."""
+import re
 from unittest import TestCase, mock
-from zowe.zos_files_for_zowe_sdk import Files
-from unit.files.constants import profile
+
+from zowe.zos_files_for_zowe_sdk import Files, exceptions, Datasets
 
 
 class TestFilesClass(TestCase):
     """File class unit tests."""
 
     def setUp(self):
         """Setup fixtures for File class."""
-        self.test_profile = profile
+        self.test_profile = {
+            "host": "mock-url.com",
+            "user": "Username",
+            "password": "Password",
+            "port": 443,
+            "rejectUnauthorized": True,
+        }
 
     @mock.patch("requests.Session.send")
     def test_list_dsn(self, mock_send_request):

diff --git a/tests/unit/files/datasets/test_migrate.py b/tests/unit/files/datasets/test_migrate.py
@@ -1,14 +1,21 @@
+import re
 from unittest import TestCase, mock
-from zowe.zos_files_for_zowe_sdk import Files
-from unit.files.constants import profile
+
+from zowe.zos_files_for_zowe_sdk import Files, exceptions, Datasets
 
 
 class TestCreateClass(TestCase):
     """File class unit tests."""
 
     def setUp(self):
         """Setup fixtures for File class."""
-        self.test_profile = profile
+        self.test_profile = {
+            "host": "mock-url.com",
+            "user": "Username",
+            "password": "Password",
+            "port": 443,
+            "rejectUnauthorized": True,
+        }
 
     @mock.patch("requests.Session.send")
     def test_recall_migrated_dataset(self, mock_send_request):

diff --git a/tests/unit/files/datasets/test_rename.py b/tests/unit/files/datasets/test_rename.py
@@ -1,15 +1,21 @@
 import re
 from unittest import TestCase, mock
-from zowe.zos_files_for_zowe_sdk import Files
-from unit.files.constants import profile
+
+from zowe.zos_files_for_zowe_sdk import Files, exceptions, Datasets
 
 
 class TestCreateClass(TestCase):
     """File class unit tests."""
 
     def setUp(self):
         """Setup fixtures for File class."""
-        self.test_profile = profile
+        self.test_profile = {
+            "host": "mock-url.com",
+            "user": "Username",
+            "password": "Password",
+            "port": 443,
+            "rejectUnauthorized": True,
+        }
 
     @mock.patch("requests.Session.send")
     def test_rename_dataset(self, mock_send_request):

diff --git a/tests/unit/files/datasets/test_write.py b/tests/unit/files/datasets/test_write.py
@@ -1,14 +1,21 @@
+import re
 from unittest import TestCase, mock
-from zowe.zos_files_for_zowe_sdk import Files
-from unit.files.constants import profile
+
+from zowe.zos_files_for_zowe_sdk import Files, exceptions, Datasets
 
 
 class TestWriteClass(TestCase):
     """File class unit tests."""
 
     def setUp(self):
         """Setup fixtures for File class."""
-        self.test_profile = profile
+        self.test_profile = {
+            "host": "mock-url.com",
+            "user": "Username",
+            "password": "Password",
+            "port": 443,
+            "rejectUnauthorized": True,
+        }
 
     @mock.patch("requests.Session.send")
     def test_write(self, mock_send_request):

diff --git a/tests/unit/files/file_systems/test_file_systems.py b/tests/unit/files/file_systems/test_file_systems.py
@@ -1,15 +1,22 @@
 """Unit tests for the Zowe Python SDK z/OS Files package."""
+import re
 from unittest import TestCase, mock
-from zowe.zos_files_for_zowe_sdk import Files, exceptions
-from unit.files.constants import profile
+
+from zowe.zos_files_for_zowe_sdk import Files, exceptions, Datasets
 
 
 class TestFilesClass(TestCase):
     """File class unit tests."""
 
     def setUp(self):
         """Setup fixtures for File class."""
-        self.test_profile = profile
+        self.test_profile = {
+            "host": "mock-url.com",
+            "user": "Username",
+            "password": "Password",
+            "port": 443,
+            "rejectUnauthorized": True,
+        }
 
     @mock.patch("requests.Session.send")
     def test_create_zFS_file_system(self, mock_send_request):

diff --git a/tests/unit/files/uss/test_uss.py b/tests/unit/files/uss/test_uss.py
@@ -1,15 +1,22 @@
 """Unit tests for the Zowe Python SDK z/OS Files package."""
+import re
 from unittest import TestCase, mock
-from zowe.zos_files_for_zowe_sdk import Files
-from unit.files.constants import profile
+
+from zowe.zos_files_for_zowe_sdk import Files, exceptions, Datasets
 
 
 class TestFilesClass(TestCase):
     """File class unit tests."""
 
     def setUp(self):
         """Setup fixtures for File class."""
-        self.test_profile = profile
+        self.test_profile = {
+            "host": "mock-url.com",
+            "user": "Username",
+            "password": "Password",
+            "port": 443,
+            "rejectUnauthorized": True,
+        }
 
     @mock.patch("requests.Session.send")
     def test_delete_uss(self, mock_send_request):

diff --git a/tests/unit/test_zos_console.py b/tests/unit/test_zos_console.py
@@ -2,7 +2,7 @@
 
 import unittest
 from unittest import mock
-from unit.files.constants import profile
+
 from zowe.zos_console_for_zowe_sdk import Console
 
 
@@ -11,7 +11,13 @@ class TestConsoleClass(unittest.TestCase):
 
     def setUp(self):
         """Setup fixtures for Console class."""
-        self.session_details = profile
+        self.session_details = {
+            "host": "mock-url.com",
+            "user": "Username",
+            "password": "Password",
+            "port": 443,
+            "rejectUnauthorized": True,
+        }
 
     def test_object_should_be_instance_of_class(self):
         """Created object should be instance of Console class."""

diff --git a/tests/unit/test_zos_jobs.py b/tests/unit/test_zos_jobs.py
@@ -1,7 +1,7 @@
 """Unit tests for the Zowe Python SDK z/OS Jobs package."""
 
 from unittest import TestCase, mock
-from unit.files.constants import profile
+
 from zowe.zos_jobs_for_zowe_sdk import Jobs
 
 
@@ -10,7 +10,13 @@ class TestJobsClass(TestCase):
 
     def setUp(self):
         """Setup fixtures for Jobs class."""
-        self.test_profile = profile
+        self.test_profile = {
+            "host": "mock-url.com",
+            "user": "Username",
+            "password": "Password",
+            "port": 443,
+            "rejectUnauthorized": True,
+        }
 
     def test_object_should_be_instance_of_class(self):
         """Created object should be instance of Jobs class."""

diff --git a/tests/unit/test_zos_tso.py b/tests/unit/test_zos_tso.py
@@ -1,7 +1,7 @@
 """Unit tests for the Zowe Python SDK z/OS TSO package."""
 
 from unittest import TestCase, mock
-from unit.files.constants import profile
+
 from zowe.zos_tso_for_zowe_sdk import Tso
 
 
@@ -10,7 +10,13 @@ class TestTsoClass(TestCase):
 
     def setUp(self):
         """Setup fixtures for Tso class."""
-        self.test_profile = profile
+        self.test_profile = {
+            "host": "mock-url.com",
+            "user": "Username",
+            "password": "Password",
+            "port": 443,
+            "rejectUnauthorized": True,
+        }
 
     def test_object_should_be_instance_of_class(self):
         """Created object should be instance of Tso class."""

diff --git a/tests/unit/test_zosmf.py b/tests/unit/test_zosmf.py
@@ -2,7 +2,7 @@
 
 import unittest
 from unittest import mock
-from unit.files.constants import profile
+
 from zowe.zosmf_for_zowe_sdk import Zosmf
 
 
@@ -11,7 +11,13 @@ class TestZosmfClass(unittest.TestCase):
 
     def setUp(self):
         """Setup fixtures for Zosmf class."""
-        self.connection_dict = profile
+        self.connection_dict = {
+            "host": "mock-url.com",
+            "user": "Username",
+            "password": "Password",
+            "port": 443,
+            "rejectUnauthorized": True,
+        }
 
     def test_object_should_be_instance_of_class(self):
         """Created object should be instance of Zosmf class."""