diff --git a/Makefile b/Makefile index a62c4621b..d143b9339 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ all: lint-fix lint coverage gen coverage: - coverage run --concurrency=multiprocessing manage.py test --failfast + coverage run --concurrency=multiprocessing manage.py test --failfast -v 3 coverage combine coverage html coverage report diff --git a/azure-pipelines.yml b/azure-pipelines.yml index fd1b6a540..055a4ddc5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -139,7 +139,7 @@ stages: displayName: Run full test suite inputs: script: | - pipenv run coverage run ./manage.py test passbook + pipenv run coverage run ./manage.py test passbook -v 3 mkdir output-unittest mv unittest.xml output-unittest/unittest.xml mv .coverage output-unittest/coverage @@ -181,7 +181,7 @@ stages: - task: CmdLine@2 displayName: Run full test suite inputs: - script: pipenv run coverage run ./manage.py test e2e + script: pipenv run coverage run ./manage.py test e2e -v 3 - task: CmdLine@2 displayName: Prepare unittests and coverage for upload inputs: diff --git a/passbook/providers/proxy/migrations/0005_auto_20200914_1536.py b/passbook/providers/proxy/migrations/0005_auto_20200914_1536.py new file mode 100644 index 000000000..af5ba200b --- /dev/null +++ b/passbook/providers/proxy/migrations/0005_auto_20200914_1536.py @@ -0,0 +1,25 @@ +# Generated by Django 3.1.1 on 2020-09-14 15:36 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("passbook_crypto", "0002_create_self_signed_kp"), + ("passbook_providers_proxy", "0004_auto_20200913_1947"), + ] + + operations = [ + migrations.AlterField( + model_name="proxyprovider", + name="certificate", + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + to="passbook_crypto.certificatekeypair", + ), + ), + ] diff --git a/passbook/providers/proxy/models.py b/passbook/providers/proxy/models.py index 65c99e380..e8b2f0bae 100644 --- a/passbook/providers/proxy/models.py +++ b/passbook/providers/proxy/models.py @@ -50,7 +50,7 @@ class ProxyProvider(OutpostModel, OAuth2Provider): cookie_secret = models.TextField(default=get_cookie_secret) certificate = models.ForeignKey( - CertificateKeyPair, on_delete=models.SET_NULL, null=True + CertificateKeyPair, on_delete=models.SET_NULL, null=True, blank=True, ) def form(self) -> Type[ModelForm]: