diff options
author | Vivien Kraus <vivien@planete-kraus.eu> | 2021-11-06 14:35:38 +0100 |
---|---|---|
committer | Vivien Kraus <vivien@planete-kraus.eu> | 2021-11-06 14:35:38 +0100 |
commit | 5ae1abc75b463a463dfc764900c79f44d6d953bf (patch) | |
tree | e76b330fe351897af2d438ed631f03db5f8d52de | |
parent | 3475446a3897bede373458574f7db60a73e3e3e9 (diff) |
Tests: use a key file for each test
Having a global key file leads to reproducibility problems and
intermittent build failures.
-rw-r--r-- | po/disfluid.pot | 2 | ||||
-rw-r--r-- | po/fr.po | 2 | ||||
-rw-r--r-- | src/scm/webid-oidc/testing.scm | 2 | ||||
-rw-r--r-- | tests/Makefile.am | 2 | ||||
-rw-r--r-- | tests/authorization-endpoint-get-form.scm | 2 | ||||
-rw-r--r-- | tests/authorization-endpoint-no-args.scm | 2 | ||||
-rw-r--r-- | tests/authorization-endpoint-submit-form.scm | 4 | ||||
-rw-r--r-- | tests/client-workflow.scm | 6 | ||||
-rw-r--r-- | tests/token-endpoint-issue.scm | 4 | ||||
-rw-r--r-- | tests/token-endpoint-refresh.scm | 4 |
10 files changed, 15 insertions, 15 deletions
diff --git a/po/disfluid.pot b/po/disfluid.pot index 542e896..3aa2c48 100644 --- a/po/disfluid.pot +++ b/po/disfluid.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: disfluid SNAPSHOT\n" "Report-Msgid-Bugs-To: vivien@planete-kraus.eu\n" -"POT-Creation-Date: 2021-10-20 18:13+0200\n" +"POT-Creation-Date: 2021-11-06 14:35+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: webid-oidc 0.0.0\n" "Report-Msgid-Bugs-To: vivien@planete-kraus.eu\n" -"POT-Creation-Date: 2021-10-20 18:13+0200\n" +"POT-Creation-Date: 2021-11-06 14:35+0100\n" "PO-Revision-Date: 2021-10-20 18:19+0200\n" "Last-Translator: Vivien Kraus <vivien@planete-kraus.eu>\n" "Language-Team: French <vivien@planete-kraus.eu>\n" diff --git a/src/scm/webid-oidc/testing.scm b/src/scm/webid-oidc/testing.scm index f594b6d..e498d52 100644 --- a/src/scm/webid-oidc/testing.scm +++ b/src/scm/webid-oidc/testing.scm @@ -34,6 +34,8 @@ (current-date (lambda () (error "cannot use the current date from within a test")))) + (mkdir-p (data-home)) + (mkdir-p (cache-home)) (call-with-output-file* (format #f "~a/seed" (cache-home)) (lambda (port) diff --git a/tests/Makefile.am b/tests/Makefile.am index b24819c..a35c853 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -83,8 +83,6 @@ clean-local: %canon_reldir%-clean-local %canon_reldir%-clean-local: rm -rf %reldir%/*.cache rm -rf %reldir%/*.home - rm -f key-file.jwk.lock - rm -f key-file.jwk AM_TESTS_ENVIRONMENT = $(top_builddir)/pre-inst-env SCM_LOG_COMPILER = $(GUILE) diff --git a/tests/authorization-endpoint-get-form.scm b/tests/authorization-endpoint-get-form.scm index a3cbf2b..3aff001 100644 --- a/tests/authorization-endpoint-get-form.scm +++ b/tests/authorization-endpoint-get-form.scm @@ -40,7 +40,7 @@ (make <authorization-endpoint> #:subject subject #:encrypted-password (crypt password "$6$some.salt.data") - #:key-file "key-file.jwk")) + #:key-file (string-append (p:data-home) "/key-file.jwk"))) (receive (response response-body response-meta) (parameterize ((p:current-date 0)) (handle endpoint diff --git a/tests/authorization-endpoint-no-args.scm b/tests/authorization-endpoint-no-args.scm index 0cc2fab..c53bafb 100644 --- a/tests/authorization-endpoint-no-args.scm +++ b/tests/authorization-endpoint-no-args.scm @@ -40,7 +40,7 @@ (make <authorization-endpoint> #:subject subject #:encrypted-password (crypt password "$6$some.salt.data") - #:key-file "key-file.jwk")) + #:key-file (string-append (p:data-home) "/key-file.jwk"))) (with-exception-handler (lambda (exn) (unless (and (web-exception? exn) diff --git a/tests/authorization-endpoint-submit-form.scm b/tests/authorization-endpoint-submit-form.scm index de5c76c..5eb90e4 100644 --- a/tests/authorization-endpoint-submit-form.scm +++ b/tests/authorization-endpoint-submit-form.scm @@ -60,7 +60,7 @@ (make <authorization-endpoint> #:subject subject #:encrypted-password encrypted-password - #:key-file "key-file.jwk")) + #:key-file (string-append (p:data-home) "/key-file.jwk"))) (parameterize ((p:anonymous-http-request (lambda* (uri #:key (headers '()) #:allow-other-keys) (unless (equal? uri what-uri-to-expect) @@ -132,7 +132,7 @@ (decode <authorization-code> (car (assoc-ref args "code")) #:issuer-key - (call-with-input-file "key-file.jwk" + (call-with-input-file (string-append (p:data-home) "/key-file.jwk") (lambda (port) (jwk->key (stubs:json->scm port)))))))) (unless parsed diff --git a/tests/client-workflow.scm b/tests/client-workflow.scm index 63d505a..420dd03 100644 --- a/tests/client-workflow.scm +++ b/tests/client-workflow.scm @@ -87,16 +87,16 @@ #:path "/authorize" #:subject "https://server.client-workflow.scm/alice#me" #:encrypted-password (crypt "password" "$6$password") - #:key-file "key-file.jwk") + #:key-file (string-append (p:data-home) "/key-file.jwk")) #:token-endpoint (make <token-endpoint> #:path "/token" #:issuer "https://server.client-workflow.scm" - #:key-file "key-file.jwk") + #:key-file (string-append (p:data-home) "/key-file.jwk")) #:jwks-endpoint (make <jwks-endpoint> #:path "/keys" - #:key-file "key-file.jwk") + #:key-file (string-append (p:data-home) "/key-file.jwk")) #:default (make <authenticator> #:backend diff --git a/tests/token-endpoint-issue.scm b/tests/token-endpoint-issue.scm index 757e650..6d1cda6 100644 --- a/tests/token-endpoint-issue.scm +++ b/tests/token-endpoint-issue.scm @@ -42,7 +42,7 @@ "token-endpoint-issue" (lambda () (define key (generate-key #:n-size 2048)) - (call-with-output-file "key-file.jwk" + (call-with-output-file (string-append (p:data-home) "/key-file.jwk") (lambda (port) (stubs:scm->json (key->jwk key) @@ -55,7 +55,7 @@ (define endpoint (make <token-endpoint> #:issuer "https://issuer.token-endpoint-issue.scm" - #:key-file "key-file.jwk")) + #:key-file (string-append (p:data-home) "/key-file.jwk"))) (define authz (parameterize ((p:current-date 0)) (issue <authorization-code> diff --git a/tests/token-endpoint-refresh.scm b/tests/token-endpoint-refresh.scm index d338f2f..3a1e5b6 100644 --- a/tests/token-endpoint-refresh.scm +++ b/tests/token-endpoint-refresh.scm @@ -42,7 +42,7 @@ "token-endpoint-refresh" (lambda () (define key (generate-key #:n-size 2048)) - (call-with-output-file "key-file.jwk" + (call-with-output-file (string-append (p:data-home) "/key-file.jwk") (lambda (port) (stubs:scm->json (key->jwk key) @@ -57,7 +57,7 @@ (define endpoint (make <token-endpoint> #:issuer "https://issuer.token-endpoint-refresh.scm" - #:key-file "key-file.jwk")) + #:key-file (string-append (p:data-home) "/key-file.jwk"))) (with-exception-handler (lambda (exn) (unless (and (web-exception? exn) |