From 0329625c40616b15439bfa7ca043bbe323766a71 Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Thu, 9 Sep 2021 13:55:40 -0700
Subject: [PATCH] Run all tests in test/ without pytest-django Move cli import
 tests to test/

---
 {kolibri/utils/tests => test}/test_cli_at_import.py | 0
 tox.ini                                             | 3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename {kolibri/utils/tests => test}/test_cli_at_import.py (100%)

diff --git a/kolibri/utils/tests/test_cli_at_import.py b/test/test_cli_at_import.py
similarity index 100%
rename from kolibri/utils/tests/test_cli_at_import.py
rename to test/test_cli_at_import.py
diff --git a/tox.ini b/tox.ini
index 08a255e3f6..62b5d87cb9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,7 +27,8 @@ deps =
 commands =
     sh -c 'kolibri manage makemigrations --check'
     # Run the actual tests
-    python -O -m pytest {posargs:--cov=kolibri --cov-report= --cov-append --color=no}
+    python -O -m pytest {posargs:--cov=kolibri --cov-report= --cov-append --color=no} kolibri
+    python -O -m pytest {posargs:--cov=kolibri --cov-report= --cov-append --color=no} -p no:django test
     # Fail if the log is longer than 200 lines (something erroring or very noisy got added)
     sh -c "if [ `cat {env:KOLIBRI_HOME}/logs/kolibri.txt | wc -l` -gt 200 ] ; then echo 'Log too long' && echo '' && tail -n 20 {env:KOLIBRI_HOME}/logs/kolibri.txt && exit 1 ; fi"