experimental; adding env var condition

pywinauto · Oct 8, 2023 · 1077bd9 · 1077bd9
1 parent 2b2b7a8
commit 1077bd9
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 30 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -12,35 +12,35 @@ environment:
 
   matrix:
 
-    - PYTHON: "C:\\Python27"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "32"
-      UIA_SUPPORT: "NO"
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-
-    - PYTHON: "C:\\Python27-x64"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "64"
-      UIA_SUPPORT: "YES"
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-
-    - PYTHON: "C:\\Python35"
-      PYTHON_VERSION: "3.5"
-      PYTHON_ARCH: "32"
-      UIA_SUPPORT: "YES"
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-
-    - PYTHON: "C:\\Python37"
-      PYTHON_VERSION: "3.7"
-      PYTHON_ARCH: "32"
-      UIA_SUPPORT: "NO"
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-
-    - PYTHON: "C:\\Python37-x64"
-      PYTHON_VERSION: "3.7"
-      PYTHON_ARCH: "64"
-      UIA_SUPPORT: "YES"
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    # - PYTHON: "C:\\Python27"
+    #   PYTHON_VERSION: "2.7"
+    #   PYTHON_ARCH: "32"
+    #   UIA_SUPPORT: "NO"
+    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+
+    # - PYTHON: "C:\\Python27-x64"
+    #   PYTHON_VERSION: "2.7"
+    #   PYTHON_ARCH: "64"
+    #   UIA_SUPPORT: "YES"
+    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+
+    # - PYTHON: "C:\\Python35"
+    #   PYTHON_VERSION: "3.5"
+    #   PYTHON_ARCH: "32"
+    #   UIA_SUPPORT: "YES"
+    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+
+    # - PYTHON: "C:\\Python37"
+    #   PYTHON_VERSION: "3.7"
+    #   PYTHON_ARCH: "32"
+    #   UIA_SUPPORT: "NO"
+    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+
+    # - PYTHON: "C:\\Python37-x64"
+    #   PYTHON_VERSION: "3.7"
+    #   PYTHON_ARCH: "64"
+    #   UIA_SUPPORT: "YES"
+    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
 
     - PYTHON: "C:\\Python38-x64"
       PYTHON_VERSION: "3.8"

diff --git a/ci/runTestsuite.ps1 b/ci/runTestsuite.ps1
@@ -43,7 +43,12 @@ function run {
 
     #nosetests  --all-modules --with-xunit pywinauto/unittests
     # --traverse-namespace is required for python 3.8 https://stackoverflow.com/q/58556183
-    nosetests --nologcapture --traverse-namespace --exclude=testall --with-xunit --with-coverage --cover-html --cover-html-dir=Coverage_report --cover-package=pywinauto --verbosity=3 pywinauto\unittests
+    $pyver = $env:PYTHON_VERSION
+    if ($pyver -lt '3.9') {
+        nosetests --nologcapture --traverse-namespace --exclude=testall --with-xunit --with-coverage --cover-html --cover-html-dir=Coverage_report --cover-package=pywinauto --verbosity=3 pywinauto\unittests
+    } else {
+        nose2 --nologcapture --exclude=testall --with-xunit --with-coverage --cover-html --cover-html-dir=Coverage_report --cover-package=pywinauto --verbosity=3 pywinauto\unittests
+    }
     $success = $?
     Write-Host "result code of nosetests:" $success