Run new rtest.py script instead of rtest.sh

diff --git a/rtest/test_regression.py b/rtest/test_regression.py
index dd9876baf8bf8c8b550033d6376f9b21cc500ebc..2deb39230ba505c131a875080b45b67b349fa2ab 100644 (file)
--- a/rtest/test_regression.py
+++ b/rtest/test_regression.py
@@ -15,14 +15,9 @@ import re
 # First run a subset of all the tests that produces equal output files
 # for all platforms and fail the test if there are differences.
 
-# FIXME: Remove skip when rtest.sh has been ported to python
-@pytest.mark.skipif(
-    platform.system() == 'Windows',
-    reason='ksh script rtest.sh does not run on Windows (#1779)'
-)
 def test_regression_subset_differences():
     os.chdir(os.path.dirname(os.path.realpath(__file__)))
-    result = subprocess.Popen(['./rtest.sh', 'tests_subset.txt'], stderr=subprocess.PIPE)
+    result = subprocess.Popen(['python3', 'rtest.py', 'tests_subset.txt'], stderr=subprocess.PIPE)
     text = result.communicate()[1]
     print(text)
     assert result.returncode == 0
@@ -31,14 +26,9 @@ def test_regression_subset_differences():
 # only if there is a crash. This will leave the differences for png
 # output in rtest/nhtml/index.html for review.
 
-# FIXME: Remove skip when rtest.sh has been ported to python
-@pytest.mark.skipif(
-    platform.system() == 'Windows',
-    reason='ksh script rtest.sh does not run on Windows'
-)
 def test_regression_failure():
     os.chdir(os.path.dirname(os.path.realpath(__file__)))
-    result = subprocess.Popen(['./rtest.sh'], stderr=subprocess.PIPE)
+    result = subprocess.Popen(['python3', 'rtest.py'], stderr=subprocess.PIPE)
     text = result.communicate()[1]
     print(text)
     assert "Layout failures: 0" in str(text)