added start_smb_os_windows.ps1 script to windows ci

jpmorganchase · Apr 7, 2020 · a6dc353 · a6dc353
1 parent 8412523
commit a6dc353
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 18 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -78,6 +78,17 @@ parameters:
     - script: curl http://127.0.0.1:9000/
       displayName: 'Test local S3 server'
 
+- name: initSmbOsWindows
+  type: stepList
+  default:
+    - task: PowerShell@2
+      inputs:
+        targetType: 'filePath'
+        filePath: 'ci/start_smb_os_windows.ps1'
+        errorActionPreference: 'stop'
+        failOnStderr: True
+      displayName: 'Expose share on os builtin samba server'
+
 - name: testSteps
   type: stepList
   default:
@@ -150,6 +161,7 @@ jobs:
         python.version: '3.7'
 
   steps:
+    - ${{ parameters.initSmbOsWindows }}
     - ${{ parameters.initS3proxySteps }}
     - ${{ parameters.initSteps }}
     - ${{ parameters.testSteps }}

diff --git a/ci/start_share_windows.ps1 → ci/start_smb_os_windows.ps1 b/ci/start_share_windows.ps1 → ci/start_smb_os_windows.ps1
diff --git a/ci/stop_share_windows.ps1 → ci/stop_smb_os_windows.ps1 b/ci/stop_share_windows.ps1 → ci/stop_smb_os_windows.ps1
diff --git a/jupyterfs/tests/conftest.py b/jupyterfs/tests/conftest.py
@@ -7,8 +7,8 @@
 PLATFORMS = set(PLATFORM_INFO.keys())
 
 def pytest_configure(config):
+    # register the platform markers
     for info in PLATFORM_INFO.items():
-        # register one of the platform markers
         config.addinivalue_line(
             "markers", "{}: mark test to run only on platform == {}".format(*info)
         )

diff --git a/jupyterfs/tests/test_pyfilesystem_manager.py b/jupyterfs/tests/test_pyfilesystem_manager.py
@@ -18,11 +18,15 @@
 test_content = 'foo\nbar\nbaz'
 test_fname = 'foo.txt'
 
-test_endpoint_url_s3 = 'http://127.0.0.1:9000'
-test_endpoint_url_smb = '127.0.0.1'
-test_name_port_smb = 3669
 test_root_osfs = 'osfs_local'
 
+test_endpoint_url_s3 = 'http://127.0.0.1:9000'
+
+test_endpoint_url_smb_docker_share = '127.0.0.1'
+test_name_port_smb_docker_share = 3669
+
+test_endpoint_url_smb_os_share = '127.0.0.1'
+
 _test_file_model = {
     'content': test_content,
     'format': 'text',
@@ -124,12 +128,16 @@ def _createContentsManager(self):
 
 @pytest.mark.darwin
 @pytest.mark.linux
-class TestPyFilesystemContentsManager_samba_docker_share(_TestBase):
+class TestPyFilesystemContentsManager_smb_docker_share(_TestBase):
     """(mac/linux only. future: windows) runs its own samba server via
     py-docker. Automatically creates and exposes a share from a docker
     container
     """
-    _rootDirUtil = samba.RootDirUtil(dir_name=test_dir, endpoint_url=test_endpoint_url_smb, name_port=test_name_port_smb)
+    _rootDirUtil = samba.RootDirUtil(
+        dir_name=test_dir,
+        endpoint_url=test_endpoint_url_smb_docker_share,
+        name_port=test_name_port_smb_docker_share,
+    )
 
     @classmethod
     def setup_class(cls):
@@ -156,8 +164,8 @@ def _createContentsManager(self):
         uri = 'smb://{username}:{passwd}@{host}/{share}?name-port={name_port}'.format(
             username=samba.smb_user,
             passwd=samba.smb_passwd,
-            host=test_endpoint_url_smb,
-            name_port=test_name_port_smb,
+            host=test_endpoint_url_smb_docker_share,
+            name_port=test_name_port_smb_docker_share,
             share=test_dir,
         )
 
@@ -167,11 +175,11 @@ def _createContentsManager(self):
 
 
 @pytest.mark.win32
-class TestPyFilesystemContentsManager_samba_os_share(_TestBase):
+class TestPyFilesystemContentsManager_smb_os_share(_TestBase):
     """(windows only. future: also mac) Uses the os's buitlin samba server.
     Creates and expose a share locally
     """
-    _rootDirUtil = samba.RootDirUtil(dir_name=test_dir, endpoint_url=test_endpoint_url_smb, name_port=test_name_port_smb)
+    _rootDirUtil = samba.RootDirUtil(dir_name=test_dir, endpoint_url=test_endpoint_url_smb_os_share)
 
     @classmethod
     def setup_class(cls):
@@ -187,15 +195,13 @@ def teardown_method(self, method):
         self._rootDirUtil.delete()
 
     def _createContentsManager(self):
-        uri = 'smb://{username}:{passwd}@{host}/{share}?name-port={name_port}'.format(
+        uri = 'smb://{username}:{passwd}@{host}/{share}'.format(
             username=samba.smb_user,
             passwd=samba.smb_passwd,
-            host=test_endpoint_url_smb,
-            name_port=test_name_port_smb,
+            host=test_endpoint_url_smb_os_share,
             share=test_dir,
         )
 
         cm = PyFilesystemContentsManager.open_fs(uri)
         assert cm.dir_exists('.')
         return cm
-
diff --git a/jupyterfs/tests/utils/samba.py b/jupyterfs/tests/utils/samba.py
@@ -31,10 +31,6 @@ def startServer(host=None, name_port=137):
         ('445/tcp', 445),
     ))
 
-    if host is not None:
-        for key, val in ports.items():
-            ports[key] = (host, val)
-
     # init docker
     docker_client = docker.from_env(version='auto')
     docker_client.info()