From 059ee74d740c18275ed5f497d3e7557b20da2bc6 Mon Sep 17 00:00:00 2001
From: simitt <silvia.mitter@elastic.co>
Date: Wed, 19 Feb 2020 15:13:17 +0100
Subject: [PATCH] next attempt of fixing windows tests

---
 magefile.go                     | 5 +++++
 script/jenkins/ci.ps1           | 3 +--
 script/jenkins/windows-test.ps1 | 3 +--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/magefile.go b/magefile.go
index 9a30f9e7311..631d59ce702 100644
--- a/magefile.go
+++ b/magefile.go
@@ -231,6 +231,11 @@ func GoTestIntegration(ctx context.Context) error {
 	return mage.GoTest(ctx, mage.DefaultGoTestIntegrationArgs())
 }
 
+// PythonUnitTest executes the python system tests.
+func PythonUnitTest() error {
+	return mage.PythonNoseTest(mage.DefaultPythonTestUnitArgs())
+}
+
 // -----------------------------------------------------------------------------
 
 // Customizations specific to apm-server.
diff --git a/script/jenkins/ci.ps1 b/script/jenkins/ci.ps1
index 9157d1144d8..770d7699d6d 100755
--- a/script/jenkins/ci.ps1
+++ b/script/jenkins/ci.ps1
@@ -64,5 +64,4 @@ refreshenv
 $env:PATH = "C:\Python38;C:\Python38\Scripts;$env:PATH"
 $env:PYTHON_ENV = "$env:TEMP\python-env"
 python --version
-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"
diff --git a/script/jenkins/windows-test.ps1 b/script/jenkins/windows-test.ps1
index fe32e253882..fc8c19d7426 100644
--- a/script/jenkins/windows-test.ps1
+++ b/script/jenkins/windows-test.ps1
@@ -64,5 +64,4 @@ refreshenv
 $env:PATH = "C:\Python38;C:\Python38\Scripts;$env:PATH"
 $env:PYTHON_ENV = "$env:TEMP\python-env"
 python --version
-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"