Merge fixes from branch '0.3'

django-helpdesk · Oct 19, 2021 · d0bbb69 · d0bbb69
2 parents e6d14b1 + 914e751
commit d0bbb69
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -5,6 +5,11 @@
 
 trigger:
 - master
+- 0.3
+
+pr:
+- master
+- 0.3
 
 pool:
   vmImage: ubuntu-latest
@@ -63,9 +68,3 @@ steps:
     #python manage.py test --testrunner xmlrunner.extra.djangotestrunner.XMLTestRunner --no-input
     python quicktest.py helpdesk
   displayName: 'Run tests'
-
-- task: PublishTestResults@2
-  inputs:
-    testResultsFiles: "**/TEST-*.xml"
-    testRunTitle: 'Python $(PYTHON_VERSION)'
-  condition: succeededOrFailed()
diff --git a/quicktest.py b/quicktest.py
@@ -100,6 +100,7 @@ def _tests(self):
             LOGIN_URL='/helpdesk/login/',
             TEMPLATES=self.TEMPLATES,
             SITE_ID=1,
+            SECRET_KEY='wowdonotusethisfakesecuritykeyyouneedarealsecure1',
             ## The following settings disable teams
             HELPDESK_TEAMS_MODEL = 'auth.User',
             HELPDESK_TEAMS_MIGRATION_DEPENDENCIES = [],