From a2dbcb4ef221b984b6faceaffc4512edeb357e15 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Tue, 27 Feb 2018 00:35:59 -0600
Subject: [PATCH] Fix pytest script-based test invocation
---
test/test_codegen.py | 2 +-
test/test_cse.py | 2 +-
test/test_fmm.py | 2 +-
test/test_kernels.py | 2 +-
test/test_matrixgen.py | 2 +-
test/test_misc.py | 2 +-
test/test_qbx.py | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/test/test_codegen.py b/test/test_codegen.py
index 0a02b6b4..7e3c25e0 100644
--- a/test/test_codegen.py
+++ b/test/test_codegen.py
@@ -112,7 +112,7 @@ if __name__ == "__main__":
if len(sys.argv) > 1:
exec(sys.argv[1])
else:
- from py.test.cmdline import main
+ from pytest import main
main([__file__])
# vim: fdm=marker
diff --git a/test/test_cse.py b/test/test_cse.py
index 5f10115c..d6a2c0f0 100644
--- a/test/test_cse.py
+++ b/test/test_cse.py
@@ -379,7 +379,7 @@ if __name__ == "__main__":
if len(sys.argv) > 1:
exec(sys.argv[1])
else:
- from py.test.cmdline import main
+ from pytest import main
main([__file__])
# vim: fdm=marker
diff --git a/test/test_fmm.py b/test/test_fmm.py
index bd1fe848..0331db6c 100644
--- a/test/test_fmm.py
+++ b/test/test_fmm.py
@@ -311,7 +311,7 @@ if __name__ == "__main__":
if len(sys.argv) > 1:
exec(sys.argv[1])
else:
- from py.test.cmdline import main
+ from pytest import main
main([__file__])
# vim: fdm=marker
diff --git a/test/test_kernels.py b/test/test_kernels.py
index 65295e29..3fcb195b 100644
--- a/test/test_kernels.py
+++ b/test/test_kernels.py
@@ -618,7 +618,7 @@ if __name__ == "__main__":
if len(sys.argv) > 1:
exec(sys.argv[1])
else:
- from py.test.cmdline import main
+ from pytest import main
main([__file__])
# vim: fdm=marker
diff --git a/test/test_matrixgen.py b/test/test_matrixgen.py
index 244a555b..c7785d04 100644
--- a/test/test_matrixgen.py
+++ b/test/test_matrixgen.py
@@ -147,7 +147,7 @@ if __name__ == "__main__":
if len(sys.argv) > 1:
exec(sys.argv[1])
else:
- from py.test.cmdline import main
+ from pytest import main
main([__file__])
# vim: fdm=marker
diff --git a/test/test_misc.py b/test/test_misc.py
index 97feecd2..7b35b2dd 100644
--- a/test/test_misc.py
+++ b/test/test_misc.py
@@ -142,7 +142,7 @@ if __name__ == "__main__":
if len(sys.argv) > 1:
exec(sys.argv[1])
else:
- from py.test.cmdline import main
+ from pytest import main
main([__file__])
# vim: fdm=marker
diff --git a/test/test_qbx.py b/test/test_qbx.py
index 3758a5d7..d408c4a4 100644
--- a/test/test_qbx.py
+++ b/test/test_qbx.py
@@ -103,7 +103,7 @@ if __name__ == "__main__":
if len(sys.argv) > 1:
exec(sys.argv[1])
else:
- from py.test.cmdline import main
+ from pytest import main
main([__file__])
# vim: fdm=marker
--
GitLab