diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/TESTS/tests.py | 11 | ||||
| -rw-r--r-- | core/views_other.py | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/core/TESTS/tests.py b/core/TESTS/tests.py index 5a4dd8d..c3ab815 100644 --- a/core/TESTS/tests.py +++ b/core/TESTS/tests.py @@ -51,7 +51,16 @@ class SimpleTest(SimpleTestCase): from troggle.core.models_caves import CaveSlug, Cave, CaveAndEntrance, QM, CaveDescription, EntranceSlug, Entrance, Area, SurvexStation from troggle.core.forms import CaveForm, CaveAndEntranceFormSet, VersionControlCommentForm, EntranceForm, EntranceLetterForm from troggle.helper import login_required_if_public - + def test_import_parses_mix(self): + import troggle.parsers.survex + import troggle.parsers.caves + import troggle.settings + import troggle.flatpages.models + import troggle.logbooksdump + import troggle.parsers.people + import troggle.parsers.surveys + import troggle.parsers.logbooks + import troggle.parsers.QMs __test__ = {"doctest": """ Another way to test that 1 + 1 is equal to 2. diff --git a/core/views_other.py b/core/views_other.py index 0b56786..c31777a 100644 --- a/core/views_other.py +++ b/core/views_other.py @@ -15,6 +15,7 @@ from troggle.core.models_survex import SurvexLeg from troggle.helper import login_required_if_public from troggle.core.forms import UploadFileForm +print("** importing troggle/core/views_other.py") def showrequest(request): return HttpResponse(request.GET) @@ -57,11 +58,12 @@ def controlPanel(request): jobs_completed=[] if request.method=='POST': if request.user.is_superuser: + # NONE of this works now that databaseReset has been so extensively rewritten #importlist is mostly here so that things happen in the correct order. #http post data seems to come in an unpredictable order, so we do it this way. importlist=['reinit_db', 'import_people', 'import_caves', 'import_logbooks', - 'import_survexblks', 'import_QMs', 'import_survexpos', 'import_surveyscans', 'import_tunnelfiles'] + 'import_survexblks', 'import_QMs', 'import_surveyscans', 'import_tunnelfiles'] databaseReset.dirsredirect() for item in importlist: if item in request.POST: |