Merge fixes from branch '0.3'

This commit is contained in:
Garret Wassermann 2021-10-18 23:05:38 -04:00
commit d0bbb6905a
2 changed files with 6 additions and 6 deletions

View File

@ -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()

View File

@ -100,6 +100,7 @@ class QuickDjangoTest(object):
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 = [],