From 9102e390d63fe446e7f3ba496ddec8f8bddeb1ac Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Sun, 13 Dec 2020 19:57:09 +0100 Subject: [PATCH] Fix tox.ini issue and minor changes The Hawthorn tests were not running due to a recent typo I added in the tox.ini 'commands' section. Fixed that. Also calling out Hawthorn in the same way as Ginko and Juniper. Now all have Open edX release specific pytest-.ini files and Hawthorn now specifies the 'OPENEDX_RELEASE' also This means that regardless of what the default environment that is set in the settings, the Hawthorn tests will specify the proper environment --- pytest-hawthorn.ini | 6 ++++++ tox.ini | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 pytest-hawthorn.ini diff --git a/pytest-hawthorn.ini b/pytest-hawthorn.ini new file mode 100644 index 00000000..ef4e900b --- /dev/null +++ b/pytest-hawthorn.ini @@ -0,0 +1,6 @@ +[pytest] +DJANGO_SETTINGS_MODULE = devsite.test_settings + +norecursedirs = .* docs requirements +python_paths = devsite mocks/hawthorn +testpaths = ./tests diff --git a/tox.ini b/tox.ini index 48d57ee4..b4b5b2b1 100644 --- a/tox.ini +++ b/tox.ini @@ -37,15 +37,16 @@ whitelist_externals = setenv = DJANGO_SETTINGS_MODULE = devsite.test_settings PYTHONPATH = {toxinidir} - # We don't need to call out Hawthorn as it is the current default environment ginkgo: OPENEDX_RELEASE = GINKGO + hawthorn: OPENEDX_RELEASE = HAWTHORN + hawthorn_multisite: OPENEDX_RELEASE = HAWTHORN py35_juniper: OPENEDX_RELEASE = JUNIPER py38_juniper: OPENEDX_RELEASE = JUNIPER commands = ginkgo: pytest -c pytest-ginkgo.ini {posargs} - hawhthorn: pytest {posargs} - hawhthorn_multisite: pytest {posargs} + hawthorn: pytest -c pytest-hawthorn.ini {posargs} + hawthorn_multisite: pytest -c pytest-hawthorn.ini {posargs} py35_juniper: pytest -c pytest-juniper.ini {posargs} py38_juniper: pytest -c pytest-juniper.ini {posargs}