From 26f4b28dddb035681cdb0cb9d2088a9c25f92459 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Thu, 6 Feb 2020 18:32:50 +0100 Subject: [PATCH 01/20] Use mage target instead of nosetests on Windows jenkins CI Mage targets manage their own virtual environments. --- dev-tools/jenkins_ci.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/jenkins_ci.ps1 b/dev-tools/jenkins_ci.ps1 index f16a126b2af..9dd4d1d4e42 100755 --- a/dev-tools/jenkins_ci.ps1 +++ b/dev-tools/jenkins_ci.ps1 @@ -65,5 +65,5 @@ exec { go test -race -c -cover -covermode=atomic -coverpkg $packages } "go test if (Test-Path "tests\system") { Set-Location -Path tests\system - exec { nosetests --with-timer --with-xunit --xunit-file=../../build/TEST-system.xml } "System test FAILURE" + exec { mage pythonUnitTest } "System test FAILURE" } From 73c59b85d57b558e3f87f9af619f95484f0db428 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Thu, 6 Feb 2020 23:17:31 +0100 Subject: [PATCH 02/20] Don't change directory --- dev-tools/jenkins_ci.ps1 | 1 - 1 file changed, 1 deletion(-) diff --git a/dev-tools/jenkins_ci.ps1 b/dev-tools/jenkins_ci.ps1 index 9dd4d1d4e42..dcbc523f8d5 100755 --- a/dev-tools/jenkins_ci.ps1 +++ b/dev-tools/jenkins_ci.ps1 @@ -64,6 +64,5 @@ $packages = ($packages|group|Select -ExpandProperty Name) -join "," exec { go test -race -c -cover -covermode=atomic -coverpkg $packages } "go test -race -cover FAILURE" if (Test-Path "tests\system") { - Set-Location -Path tests\system exec { mage pythonUnitTest } "System test FAILURE" } From b7c5614bed9c67a8e9ee161cdac1ab1fa1859b73 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Thu, 6 Feb 2020 23:18:15 +0100 Subject: [PATCH 03/20] Add message --- dev-tools/jenkins_ci.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-tools/jenkins_ci.ps1 b/dev-tools/jenkins_ci.ps1 index dcbc523f8d5..d5d6f32b6a9 100755 --- a/dev-tools/jenkins_ci.ps1 +++ b/dev-tools/jenkins_ci.ps1 @@ -64,5 +64,6 @@ $packages = ($packages|group|Select -ExpandProperty Name) -join "," exec { go test -race -c -cover -covermode=atomic -coverpkg $packages } "go test -race -cover FAILURE" if (Test-Path "tests\system") { + echo "Running python tests" exec { mage pythonUnitTest } "System test FAILURE" } From 269a17ab59d49a9e8de0d680aac5b83531e9325c Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Fri, 7 Feb 2020 00:13:41 +0100 Subject: [PATCH 04/20] Set PYTHON_EXE --- dev-tools/jenkins_ci.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-tools/jenkins_ci.ps1 b/dev-tools/jenkins_ci.ps1 index d5d6f32b6a9..f36fc9f42ba 100755 --- a/dev-tools/jenkins_ci.ps1 +++ b/dev-tools/jenkins_ci.ps1 @@ -65,5 +65,6 @@ exec { go test -race -c -cover -covermode=atomic -coverpkg $packages } "go test if (Test-Path "tests\system") { echo "Running python tests" + $env:PYTHON_EXE = "python3" exec { mage pythonUnitTest } "System test FAILURE" } From 02b0f75aee69a51cee8af6ce18387e9b8126d6be Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Fri, 7 Feb 2020 11:47:07 +0100 Subject: [PATCH 05/20] Try to install python in build directory --- dev-tools/jenkins_ci.ps1 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dev-tools/jenkins_ci.ps1 b/dev-tools/jenkins_ci.ps1 index f36fc9f42ba..4728d8b2c5c 100755 --- a/dev-tools/jenkins_ci.ps1 +++ b/dev-tools/jenkins_ci.ps1 @@ -64,7 +64,12 @@ $packages = ($packages|group|Select -ExpandProperty Name) -join "," exec { go test -race -c -cover -covermode=atomic -coverpkg $packages } "go test -race -cover FAILURE" if (Test-Path "tests\system") { + # Installation of python 3 to be removed once it is installed in the base image + echo "Installing python 3" + Invoke-WebRequest -Uri "https://www.python.org/ftp/python/3.7.6/python-3.7.6-embed-amd64.zip" | Expand-Archive -DestinationPath "build/python" -Force + $currentDir = (Get-Item -Path ".\").FullName + $env:PATH = "$currentDir\build\python;$env:PATH" + echo "Running python tests" - $env:PYTHON_EXE = "python3" exec { mage pythonUnitTest } "System test FAILURE" } From dd6b251bb65de01a42ed15f514fa478fee5d929a Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Fri, 7 Feb 2020 13:18:09 +0100 Subject: [PATCH 06/20] Try to install using python installer --- dev-tools/jenkins_ci.ps1 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dev-tools/jenkins_ci.ps1 b/dev-tools/jenkins_ci.ps1 index 4728d8b2c5c..372460d8928 100755 --- a/dev-tools/jenkins_ci.ps1 +++ b/dev-tools/jenkins_ci.ps1 @@ -64,11 +64,14 @@ $packages = ($packages|group|Select -ExpandProperty Name) -join "," exec { go test -race -c -cover -covermode=atomic -coverpkg $packages } "go test -race -cover FAILURE" if (Test-Path "tests\system") { - # Installation of python 3 to be removed once it is installed in the base image echo "Installing python 3" - Invoke-WebRequest -Uri "https://www.python.org/ftp/python/3.7.6/python-3.7.6-embed-amd64.zip" | Expand-Archive -DestinationPath "build/python" -Force $currentDir = (Get-Item -Path ".\").FullName + [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 + Invoke-WebRequest -Uri "https://www.python.org/ftp/python/3.7.6/python-3.7.6-amd64.exe" -OutFile "build\python-installer.exe" + .\build\python-installer.exe /quiet InstallAllUsers=0 SimpleInstall=1 Shortcuts=0 Include_launcher=0 AssociateFiles=0 Include_test=0 Include_doc=0 TargetDir="$currentDir\build\python" $env:PATH = "$currentDir\build\python;$env:PATH" + python --version + python -m venv --help echo "Running python tests" exec { mage pythonUnitTest } "System test FAILURE" From 0de43081afc8f4d2adf2f36b5d56f31637e1bcba Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Fri, 7 Feb 2020 14:03:22 +0100 Subject: [PATCH 07/20] Wait for installation to finish --- dev-tools/jenkins_ci.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/jenkins_ci.ps1 b/dev-tools/jenkins_ci.ps1 index 372460d8928..cf6e4e837bd 100755 --- a/dev-tools/jenkins_ci.ps1 +++ b/dev-tools/jenkins_ci.ps1 @@ -68,7 +68,7 @@ if (Test-Path "tests\system") { $currentDir = (Get-Item -Path ".\").FullName [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 Invoke-WebRequest -Uri "https://www.python.org/ftp/python/3.7.6/python-3.7.6-amd64.exe" -OutFile "build\python-installer.exe" - .\build\python-installer.exe /quiet InstallAllUsers=0 SimpleInstall=1 Shortcuts=0 Include_launcher=0 AssociateFiles=0 Include_test=0 Include_doc=0 TargetDir="$currentDir\build\python" + .\build\python-installer.exe /quiet InstallAllUsers=0 SimpleInstall=1 Shortcuts=0 Include_launcher=0 AssociateFiles=0 Include_test=0 Include_doc=0 TargetDir="$currentDir\build\python" | Out-Null $env:PATH = "$currentDir\build\python;$env:PATH" python --version python -m venv --help From 7a16bbb17584b5a49bc3d6f5b5d243c208417922 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Fri, 7 Feb 2020 14:21:22 +0100 Subject: [PATCH 08/20] Revert installation --- dev-tools/jenkins_ci.ps1 | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dev-tools/jenkins_ci.ps1 b/dev-tools/jenkins_ci.ps1 index cf6e4e837bd..d5d6f32b6a9 100755 --- a/dev-tools/jenkins_ci.ps1 +++ b/dev-tools/jenkins_ci.ps1 @@ -64,15 +64,6 @@ $packages = ($packages|group|Select -ExpandProperty Name) -join "," exec { go test -race -c -cover -covermode=atomic -coverpkg $packages } "go test -race -cover FAILURE" if (Test-Path "tests\system") { - echo "Installing python 3" - $currentDir = (Get-Item -Path ".\").FullName - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 - Invoke-WebRequest -Uri "https://www.python.org/ftp/python/3.7.6/python-3.7.6-amd64.exe" -OutFile "build\python-installer.exe" - .\build\python-installer.exe /quiet InstallAllUsers=0 SimpleInstall=1 Shortcuts=0 Include_launcher=0 AssociateFiles=0 Include_test=0 Include_doc=0 TargetDir="$currentDir\build\python" | Out-Null - $env:PATH = "$currentDir\build\python;$env:PATH" - python --version - python -m venv --help - echo "Running python tests" exec { mage pythonUnitTest } "System test FAILURE" } From 8e39c993657892297137c93157d82fad3ea5a70c Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Fri, 7 Feb 2020 14:53:00 +0100 Subject: [PATCH 09/20] Install python 3 with choco --- dev-tools/jenkins_ci.ps1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev-tools/jenkins_ci.ps1 b/dev-tools/jenkins_ci.ps1 index d5d6f32b6a9..cfac03235fb 100755 --- a/dev-tools/jenkins_ci.ps1 +++ b/dev-tools/jenkins_ci.ps1 @@ -65,5 +65,7 @@ exec { go test -race -c -cover -covermode=atomic -coverpkg $packages } "go test if (Test-Path "tests\system") { echo "Running python tests" + choco install -y python3 + python --version exec { mage pythonUnitTest } "System test FAILURE" } From a288015934f17dd77e4cfd93d0fe87e0acb88a72 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Fri, 7 Feb 2020 16:09:51 +0100 Subject: [PATCH 10/20] Update path --- dev-tools/jenkins_ci.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-tools/jenkins_ci.ps1 b/dev-tools/jenkins_ci.ps1 index cfac03235fb..626b6b93952 100755 --- a/dev-tools/jenkins_ci.ps1 +++ b/dev-tools/jenkins_ci.ps1 @@ -65,7 +65,9 @@ exec { go test -race -c -cover -covermode=atomic -coverpkg $packages } "go test if (Test-Path "tests\system") { echo "Running python tests" - choco install -y python3 + choco install python -y -r --version 3.8.1.20200110 + refreshenv + $env:PATH = "$env:PATH;C:\\Python38;C:\\Python38\\Scripts" python --version exec { mage pythonUnitTest } "System test FAILURE" } From da5a6f73465dff48b613bf31b3e37867b787ebc7 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Fri, 7 Feb 2020 16:44:48 +0100 Subject: [PATCH 11/20] Fix path --- dev-tools/jenkins_ci.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-tools/jenkins_ci.ps1 b/dev-tools/jenkins_ci.ps1 index 626b6b93952..f7ab10e7767 100755 --- a/dev-tools/jenkins_ci.ps1 +++ b/dev-tools/jenkins_ci.ps1 @@ -65,9 +65,9 @@ exec { go test -race -c -cover -covermode=atomic -coverpkg $packages } "go test if (Test-Path "tests\system") { echo "Running python tests" - choco install python -y -r --version 3.8.1.20200110 + choco install python -y -r --no-progress --version 3.8.1.20200110 refreshenv - $env:PATH = "$env:PATH;C:\\Python38;C:\\Python38\\Scripts" + $env:PATH = "C:\\Python38;C:\\Python38\\Scripts;$env:PATH" python --version exec { mage pythonUnitTest } "System test FAILURE" } From 2b81703cae8fb5b136b9afa9302d1b40f121dda4 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Fri, 7 Feb 2020 16:52:26 +0100 Subject: [PATCH 12/20] Fix path again --- dev-tools/jenkins_ci.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/jenkins_ci.ps1 b/dev-tools/jenkins_ci.ps1 index f7ab10e7767..3bb2651edca 100755 --- a/dev-tools/jenkins_ci.ps1 +++ b/dev-tools/jenkins_ci.ps1 @@ -67,7 +67,7 @@ if (Test-Path "tests\system") { echo "Running python tests" choco install python -y -r --no-progress --version 3.8.1.20200110 refreshenv - $env:PATH = "C:\\Python38;C:\\Python38\\Scripts;$env:PATH" + $env:PATH = "C:\Python38;C:\Python38\Scripts;$env:PATH" python --version exec { mage pythonUnitTest } "System test FAILURE" } From e1a5a9b97d00e53cd625c599ca2ccd65fc072d40 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Mon, 10 Feb 2020 15:50:43 +0100 Subject: [PATCH 13/20] Remove future from requirements --- libbeat/tests/system/requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/libbeat/tests/system/requirements.txt b/libbeat/tests/system/requirements.txt index db50fed09fb..c6a9ac33a2d 100644 --- a/libbeat/tests/system/requirements.txt +++ b/libbeat/tests/system/requirements.txt @@ -10,7 +10,6 @@ dockerpty==0.4.1 docopt==0.6.2 elasticsearch==7.1.0 enum34==1.1.6 -future==0.18.2 idna==2.6 ipaddress==1.0.19 Jinja2==2.10.1 From a1fbf12d14ec442600c1de403c0719a4ea3f75ee Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Mon, 10 Feb 2020 17:30:59 +0100 Subject: [PATCH 14/20] Remove uses of future/past --- filebeat/tests/open-file-handlers/log_stdout.py | 3 +-- filebeat/tests/system/test_load.py | 3 +-- script/kibana-migration.py | 1 - script/renamed_fields.py | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/filebeat/tests/open-file-handlers/log_stdout.py b/filebeat/tests/open-file-handlers/log_stdout.py index aafc619d970..c00c7bf2632 100644 --- a/filebeat/tests/open-file-handlers/log_stdout.py +++ b/filebeat/tests/open-file-handlers/log_stdout.py @@ -1,4 +1,3 @@ -from past.utils import old_div import time import sys @@ -19,5 +18,5 @@ # Setup python log handler handler = logging.handlers.RotatingFileHandler( log_file, maxBytes=line_length * lines_per_file + 1, - backupCount=old_div(total_lines, lines_per_file) + 1) + backupCount=int(total_lines/lines_per_file) + 1) logger.addHandler(handler) diff --git a/filebeat/tests/system/test_load.py b/filebeat/tests/system/test_load.py index 8a0eae75973..b53a8d18032 100644 --- a/filebeat/tests/system/test_load.py +++ b/filebeat/tests/system/test_load.py @@ -1,4 +1,3 @@ -from past.utils import old_div from filebeat import BaseTest import os import logging @@ -41,7 +40,7 @@ def test_no_missing_events(self): # Setup python log handler handler = logging.handlers.RotatingFileHandler( log_file, maxBytes=line_length * lines_per_file + 1, - backupCount=old_div(total_lines, lines_per_file) + 1) + backupCount=int(total_lines / lines_per_file) + 1) logger.addHandler(handler) self.render_config_template( diff --git a/script/kibana-migration.py b/script/kibana-migration.py index 401a1ccdb25..aa3d7d12fe2 100644 --- a/script/kibana-migration.py +++ b/script/kibana-migration.py @@ -1,4 +1,3 @@ -from past.builtins import basestring import yaml import glob diff --git a/script/renamed_fields.py b/script/renamed_fields.py index b0d551e3a1b..43804c5d8fc 100644 --- a/script/renamed_fields.py +++ b/script/renamed_fields.py @@ -1,4 +1,3 @@ -from past.builtins import basestring import yaml From ded3557fa2f77acb1a02e6f18cc0ac5265e9bb2a Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Mon, 10 Feb 2020 18:02:42 +0100 Subject: [PATCH 15/20] Explictly open file as utf-8 --- filebeat/tests/system/test_crawler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filebeat/tests/system/test_crawler.py b/filebeat/tests/system/test_crawler.py index d828e41830a..893d591dd8e 100644 --- a/filebeat/tests/system/test_crawler.py +++ b/filebeat/tests/system/test_crawler.py @@ -528,7 +528,7 @@ def test_utf8(self): lambda: self.output_has(lines=1), max_timeout=10) # Append utf-8 chars to check if it keeps reading - with codecs.open(testfile, "a") as f: + with codecs.open(testfile, "a", "utf-8") as f: # write additional lines f.write("Hello\n") f.write("薩科Ruflin" + "\n") From c901e0783a8ec29a8530ce72d4cade45ebbe0662 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Mon, 10 Feb 2020 18:29:19 +0100 Subject: [PATCH 16/20] Add unittest common targets --- heartbeat/magefile.go | 2 ++ journalbeat/magefile.go | 2 ++ libbeat/magefile.go | 2 ++ 3 files changed, 6 insertions(+) diff --git a/heartbeat/magefile.go b/heartbeat/magefile.go index b9d954ac643..84a38bf5e62 100644 --- a/heartbeat/magefile.go +++ b/heartbeat/magefile.go @@ -35,6 +35,8 @@ import ( "github.com/elastic/beats/dev-tools/mage/target/common" // mage:import _ "github.com/elastic/beats/dev-tools/mage/target/integtest/notests" + // mage:import + _ "github.com/elastic/beats/dev-tools/mage/target/unittest" ) func init() { diff --git a/journalbeat/magefile.go b/journalbeat/magefile.go index 74bf0d17931..4e3b2c8e5e0 100644 --- a/journalbeat/magefile.go +++ b/journalbeat/magefile.go @@ -35,6 +35,8 @@ import ( "github.com/elastic/beats/dev-tools/mage/target/common" // mage:import _ "github.com/elastic/beats/dev-tools/mage/target/integtest/notests" + // mage:import + _ "github.com/elastic/beats/dev-tools/mage/target/unittest" ) func init() { diff --git a/libbeat/magefile.go b/libbeat/magefile.go index efdbc87d497..eb5dfe022af 100644 --- a/libbeat/magefile.go +++ b/libbeat/magefile.go @@ -26,6 +26,8 @@ import ( // mage:import _ "github.com/elastic/beats/dev-tools/mage/target/common" + // mage:import + _ "github.com/elastic/beats/dev-tools/mage/target/unittest" ) // Build builds the Beat binary. From 11616cfd1028fe143c889735d1bc596e6c10daf6 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Mon, 10 Feb 2020 18:59:46 +0100 Subject: [PATCH 17/20] Add pythonUnitTest to x-pack libbeat --- x-pack/libbeat/magefile.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/x-pack/libbeat/magefile.go b/x-pack/libbeat/magefile.go index f859423a084..155d1354806 100644 --- a/x-pack/libbeat/magefile.go +++ b/x-pack/libbeat/magefile.go @@ -15,6 +15,8 @@ import ( _ "github.com/elastic/beats/dev-tools/mage/target/common" // mage:import _ "github.com/elastic/beats/dev-tools/mage/target/integtest" + // mage:import + _ "github.com/elastic/beats/dev-tools/mage/target/unittest" ) func init() { From 22c723b72f9967b37676dbe65404e1adbb0de983 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Tue, 11 Feb 2020 17:15:59 +0100 Subject: [PATCH 18/20] Set PYTHON_ENV to a temporal directory --- dev-tools/jenkins_ci.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-tools/jenkins_ci.ps1 b/dev-tools/jenkins_ci.ps1 index 3bb2651edca..45eff571c93 100755 --- a/dev-tools/jenkins_ci.ps1 +++ b/dev-tools/jenkins_ci.ps1 @@ -68,6 +68,7 @@ if (Test-Path "tests\system") { choco install python -y -r --no-progress --version 3.8.1.20200110 refreshenv $env:PATH = "C:\Python38;C:\Python38\Scripts;$env:PATH" + $env:PYTHON_ENV = "$env:TEMP\python-env python --version exec { mage pythonUnitTest } "System test FAILURE" } From 5245db7eaf435006657fff3ff4891f53cde87ede Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Tue, 11 Feb 2020 17:24:21 +0100 Subject: [PATCH 19/20] Use utf_8 as encoding in python test --- filebeat/tests/system/test_crawler.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/filebeat/tests/system/test_crawler.py b/filebeat/tests/system/test_crawler.py index 893d591dd8e..2b22e7e830b 100644 --- a/filebeat/tests/system/test_crawler.py +++ b/filebeat/tests/system/test_crawler.py @@ -517,7 +517,7 @@ def test_utf8(self): max_timeout=15) # Add utf-8 Chars for the first time - with codecs.open(testfile, "w", "utf-8") as f: + with codecs.open(testfile, "w", "utf_8") as f: # Write lines before registrar started # Special encoding needed?!? @@ -528,7 +528,7 @@ def test_utf8(self): lambda: self.output_has(lines=1), max_timeout=10) # Append utf-8 chars to check if it keeps reading - with codecs.open(testfile, "a", "utf-8") as f: + with codecs.open(testfile, "a", "utf_8") as f: # write additional lines f.write("Hello\n") f.write("薩科Ruflin" + "\n") From 058cfd3d14fc1ea4b3207eb89cd1e357ee913b8c Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Tue, 11 Feb 2020 17:47:02 +0100 Subject: [PATCH 20/20] Typo --- dev-tools/jenkins_ci.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/jenkins_ci.ps1 b/dev-tools/jenkins_ci.ps1 index 45eff571c93..87093208055 100755 --- a/dev-tools/jenkins_ci.ps1 +++ b/dev-tools/jenkins_ci.ps1 @@ -68,7 +68,7 @@ if (Test-Path "tests\system") { choco install python -y -r --no-progress --version 3.8.1.20200110 refreshenv $env:PATH = "C:\Python38;C:\Python38\Scripts;$env:PATH" - $env:PYTHON_ENV = "$env:TEMP\python-env + $env:PYTHON_ENV = "$env:TEMP\python-env" python --version exec { mage pythonUnitTest } "System test FAILURE" }