From 7088263ecc3bfd38481f82d2a70756bba5fb8977 Mon Sep 17 00:00:00 2001
From: Simon Rose <simon.rose@ess.eu>
Date: Mon, 21 Jun 2021 16:02:38 +0200
Subject: [PATCH] Refactored to only use pytest
---
configure/E3/CONFIG_TEST | 2 --
configure/E3/RULES_TEST | 15 ++-------------
tests/{test_build => }/data/Makefile | 0
tests/{test_build => }/data/build/database.db | 0
.../data/patch/Site/0.0.0+0/apply.p0.patch | 0
.../data/patch/Site/0.0.0-dont-apply.p0.patch | 0
.../data/patch/Site/0.0.0/dont-apply.p0.patch | 0
tests/{test_build => }/test_build.py | 0
tests/test_build/Makefile | 15 ---------------
tests/test_iocsh/Makefile | 4 ----
tests/{test_versions => }/test_versions.py | 0
tests/test_versions/Makefile | 15 ---------------
12 files changed, 2 insertions(+), 49 deletions(-)
rename tests/{test_build => }/data/Makefile (100%)
rename tests/{test_build => }/data/build/database.db (100%)
rename tests/{test_build => }/data/patch/Site/0.0.0+0/apply.p0.patch (100%)
rename tests/{test_build => }/data/patch/Site/0.0.0-dont-apply.p0.patch (100%)
rename tests/{test_build => }/data/patch/Site/0.0.0/dont-apply.p0.patch (100%)
rename tests/{test_build => }/test_build.py (100%)
delete mode 100644 tests/test_build/Makefile
delete mode 100644 tests/test_iocsh/Makefile
rename tests/{test_versions => }/test_versions.py (100%)
delete mode 100644 tests/test_versions/Makefile
diff --git a/configure/E3/CONFIG_TEST b/configure/E3/CONFIG_TEST
index 1a89b51e..4b27c89c 100644
--- a/configure/E3/CONFIG_TEST
+++ b/configure/E3/CONFIG_TEST
@@ -1,3 +1 @@
TEST_DIR:=$(TOP)/tests
-
-TESTS:=$(wildcard $(TEST_DIR)/test*)
\ No newline at end of file
diff --git a/configure/E3/RULES_TEST b/configure/E3/RULES_TEST
index 11216464..5a6e2b84 100644
--- a/configure/E3/RULES_TEST
+++ b/configure/E3/RULES_TEST
@@ -1,15 +1,4 @@
.PHONY: test
-test: collect_tests $(TESTS)
-
-.PHONY: collect_tests
-collect_tests:
- @echo "Collecting tests:"
- @for test in $(TESTS); do \
- printf " %s\n" "$$test"; \
- done;
-
-.PHONY: $(TESTS)
-$(TESTS):
- $(info Running test $@...)
- ${QUIET}${MAKE} -C $@ test
+test:
+ pytest $(TEST_DIR) -v
diff --git a/tests/test_build/data/Makefile b/tests/data/Makefile
similarity index 100%
rename from tests/test_build/data/Makefile
rename to tests/data/Makefile
diff --git a/tests/test_build/data/build/database.db b/tests/data/build/database.db
similarity index 100%
rename from tests/test_build/data/build/database.db
rename to tests/data/build/database.db
diff --git a/tests/test_build/data/patch/Site/0.0.0+0/apply.p0.patch b/tests/data/patch/Site/0.0.0+0/apply.p0.patch
similarity index 100%
rename from tests/test_build/data/patch/Site/0.0.0+0/apply.p0.patch
rename to tests/data/patch/Site/0.0.0+0/apply.p0.patch
diff --git a/tests/test_build/data/patch/Site/0.0.0-dont-apply.p0.patch b/tests/data/patch/Site/0.0.0-dont-apply.p0.patch
similarity index 100%
rename from tests/test_build/data/patch/Site/0.0.0-dont-apply.p0.patch
rename to tests/data/patch/Site/0.0.0-dont-apply.p0.patch
diff --git a/tests/test_build/data/patch/Site/0.0.0/dont-apply.p0.patch b/tests/data/patch/Site/0.0.0/dont-apply.p0.patch
similarity index 100%
rename from tests/test_build/data/patch/Site/0.0.0/dont-apply.p0.patch
rename to tests/data/patch/Site/0.0.0/dont-apply.p0.patch
diff --git a/tests/test_build/test_build.py b/tests/test_build.py
similarity index 100%
rename from tests/test_build/test_build.py
rename to tests/test_build.py
diff --git a/tests/test_build/Makefile b/tests/test_build/Makefile
deleted file mode 100644
index da755d08..00000000
--- a/tests/test_build/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-
-.PHONY: default
-default: test
-
-.PHONY: test
-test: check_env
- @pytest . -v
-
-.PHONY: check_env
-check_env: guard-EPICS_BASE guard-E3_REQUIRE_VERSION
- @#$(or $(wildcard ${EPICS_BASE}/require/${E3_REQUIRE_VERSION}/bin/setE3Env.bash), $(error setE3Env.bash not found. Please check your version of base and require.))
-
-guard-%:
- @#$(or ${$*}, $(error $* is not set))
-
diff --git a/tests/test_iocsh/Makefile b/tests/test_iocsh/Makefile
deleted file mode 100644
index a8104d32..00000000
--- a/tests/test_iocsh/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-.PHONY: test
-
-test:
- echo exit | iocsh.bash
\ No newline at end of file
diff --git a/tests/test_versions/test_versions.py b/tests/test_versions.py
similarity index 100%
rename from tests/test_versions/test_versions.py
rename to tests/test_versions.py
diff --git a/tests/test_versions/Makefile b/tests/test_versions/Makefile
deleted file mode 100644
index da755d08..00000000
--- a/tests/test_versions/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-
-.PHONY: default
-default: test
-
-.PHONY: test
-test: check_env
- @pytest . -v
-
-.PHONY: check_env
-check_env: guard-EPICS_BASE guard-E3_REQUIRE_VERSION
- @#$(or $(wildcard ${EPICS_BASE}/require/${E3_REQUIRE_VERSION}/bin/setE3Env.bash), $(error setE3Env.bash not found. Please check your version of base and require.))
-
-guard-%:
- @#$(or ${$*}, $(error $* is not set))
-
--
GitLab