Skip to content

Commit

Permalink
Fix tox.ini issue and minor changes
Browse files Browse the repository at this point in the history
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-<named release>.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
  • Loading branch information
johnbaldwin committed Dec 13, 2020
1 parent 85a6ea7 commit 9102e39
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
6 changes: 6 additions & 0 deletions pytest-hawthorn.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[pytest]
DJANGO_SETTINGS_MODULE = devsite.test_settings

norecursedirs = .* docs requirements
python_paths = devsite mocks/hawthorn
testpaths = ./tests
7 changes: 4 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down

0 comments on commit 9102e39

Please sign in to comment.