temp disable smb test on mac CI; until actions/runner-images#1042

- ref: actions/runner-images#1042
telamonian · Jun 24, 2020 · 4633c9c · 4633c9c
1 parent 85c097a
commit 4633c9c
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 9 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -160,7 +160,7 @@ parameters:
 
 
 jobs:
-- job: 'integrity__linux'
+- job: 'integrity (linux)'
   pool:
     vmImage: 'ubuntu-latest'
   variables:
@@ -170,7 +170,7 @@ jobs:
     - ${{ parameters.initSteps }}
     - ${{ parameters.lintSteps }}
 
-- job: 'javascript__linux'
+- job: 'javascript (linux)'
   pool:
     vmImage: 'ubuntu-latest'
   variables:
@@ -180,7 +180,7 @@ jobs:
     - ${{ parameters.initSteps }}
     - ${{ parameters.testJavascriptSteps }}
 
-- job: 'browser_check__linux'
+- job: 'browser_check (linux)'
   pool:
     vmImage: 'ubuntu-latest'
   variables:
@@ -192,8 +192,31 @@ jobs:
     - ${{ parameters.initSteps }}
     - ${{ parameters.testBrowserSteps }}
 
-# the python__foo jobs, renamed to match required tests on github
+- job: 'python (linux)'
+  pool:
+    vmImage: 'ubuntu-latest'
+  variables:
+    python.version: '3.7'
+
+  steps:
+    - ${{ parameters.initDockerSteps }}
+    - ${{ parameters.pullContainersSteps }}
+    - ${{ parameters.initSteps }}
+    - ${{ parameters.testPythonSteps }}
+
+- job: 'python (mac)'
+  pool:
+    vmImage: 'macos-10.14'
+  variables:
+    python.version: '3.7'
+
+  steps:
+    - ${{ parameters.initDockerMacSteps }}
+    - ${{ parameters.pullContainersSteps }}
+    - ${{ parameters.initSteps }}
+    - ${{ parameters.testPythonSteps }}
 
+# TODO: delete this duplicate job, once the required test has been renamed on github: "Linux Python37" => "python (linux)"
 - job: 'Linux'
   pool:
     vmImage: 'ubuntu-latest'
@@ -208,6 +231,7 @@ jobs:
     - ${{ parameters.initSteps }}
     - ${{ parameters.testPythonSteps }}
 
+# TODO: delete this duplicate job, once the required test has been renamed on github: "Mac Python37" => "python (mac)"
 - job: 'Mac'
   pool:
     vmImage: 'macos-10.14'

diff --git a/ci/browser_check.sh b/ci/browser_check.sh
@@ -41,7 +41,9 @@ cat <<EOT > "${PLUGIN_SETTINGS}"
       "url": "osfs://${WORKSPACE_FOLDER}"
     }
   ],
-  "verbose": true
+  "options": {
+    "verbose": true
+  },
 }
 EOT
 

diff --git a/jupyterfs/tests/test_fsmanager.py b/jupyterfs/tests/test_fsmanager.py
@@ -24,11 +24,20 @@
 test_url_s3 = 'http://127.0.0.1/'
 test_port_s3 = '9000'
 
+# TODO: remove the try/except once https://github.com/actions/virtual-environments/issues/1042 is resolved
+try:
+    test_host_smb_docker_share = socket.gethostbyname(socket.gethostname())
+except socket.gaierror:
+    test_host_smb_docker_share = 'this_computer'
 test_hostname_smb_docker_share = 'TESTNET'
 test_name_port_smb_docker_share = 3669
 
 test_direct_tcp_smb_os_share = False
-test_host_smb_os_share = socket.gethostbyname_ex(socket.gethostname())[2][-1]
+# TODO: remove the try/except once https://github.com/actions/virtual-environments/issues/1042 is resolved
+try:
+    test_host_smb_os_share = socket.gethostbyname_ex(socket.gethostname())[2][-1]
+except socket.gaierror:
+    test_host_smb_os_share = 'this_computer'
 test_smb_port_smb_os_share = 139
 
 _test_file_model = {
@@ -136,8 +145,8 @@ def _createContentsManager(self):
 
         return FSManager.open_fs(uri)
 
-
-@pytest.mark.darwin
+# TODO: reenable darwin once https://github.com/actions/virtual-environments/issues/1042 is resolved
+# @pytest.mark.darwin
 @pytest.mark.linux
 class Test_FSManager_smb_docker_share(_TestBase):
     """(mac/linux only. future: windows) runs its own samba server via
@@ -154,6 +163,7 @@ class Test_FSManager_smb_docker_share(_TestBase):
     """
     _rootDirUtil = samba.RootDirUtil(
         dir_name=test_dir,
+        host=test_host_smb_docker_share,
         hostname=test_hostname_smb_docker_share,
         name_port=test_name_port_smb_docker_share,
     )
@@ -183,7 +193,7 @@ def _createContentsManager(self):
         uri = 'smb://{username}:{passwd}@{host}/{share}?name-port={name_port}'.format(
             username=samba.smb_user,
             passwd=samba.smb_passwd,
-            host=socket.gethostbyname(socket.gethostname()),
+            host=test_host_smb_docker_share,
             name_port=test_name_port_smb_docker_share,
             share=test_dir,
         )