From 92e26e6338ca687ea6d18fa9748f804314e8a12e Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Tue, 27 Feb 2018 00:34:01 -0600
Subject: [PATCH] Fix pytest script-based test invocation
---
test/test_algorithm.py | 2 +-
test/test_array.py | 2 +-
test/test_clmath.py | 2 +-
test/test_enqueue_copy.py | 2 +-
test/test_wrapper.py | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/test/test_algorithm.py b/test/test_algorithm.py
index 9bd15f86..b7b296ce 100644
--- a/test/test_algorithm.py
+++ b/test/test_algorithm.py
@@ -1031,7 +1031,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: filetype=pyopencl:fdm=marker
diff --git a/test/test_array.py b/test/test_array.py
index a9c17170..bca78f5c 100644
--- a/test/test_array.py
+++ b/test/test_array.py
@@ -1219,7 +1219,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: filetype=pyopencl:fdm=marker
diff --git a/test/test_clmath.py b/test/test_clmath.py
index aaa89daf..553ed7a6 100644
--- a/test/test_clmath.py
+++ b/test/test_clmath.py
@@ -452,5 +452,5 @@ 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__])
diff --git a/test/test_enqueue_copy.py b/test/test_enqueue_copy.py
index 564e833a..bfbf4f16 100644
--- a/test/test_enqueue_copy.py
+++ b/test/test_enqueue_copy.py
@@ -218,5 +218,5 @@ 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__])
diff --git a/test/test_wrapper.py b/test/test_wrapper.py
index 2bf41bc7..9091c9cd 100644
--- a/test/test_wrapper.py
+++ b/test/test_wrapper.py
@@ -1066,5 +1066,5 @@ 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__])
--
GitLab