From: Maxime Devos <maximedevos@telenet.be>
To: 53389@debbugs.gnu.org
Cc: ludo@gnu.org, Maxime Devos <maximedevos@telenet.be>
Subject: [bug#53389] [PATCH 7/9] tests: Allow checking the URI of a HTTP request.
Date: Thu, 20 Jan 2022 13:08:47 +0000 [thread overview]
Message-ID: <20220120130849.292178-7-maximedevos@telenet.be> (raw)
In-Reply-To: <20220120130849.292178-1-maximedevos@telenet.be>
* guix/tests/http.scm (call-with-http-server): Thunk RESPONSES+DATA.
[maybe-uri?]: New procedure.
[sanitize-response+data]: New procedure extracted from the definition of
'responses', support triples containing a URI.
[responses]: Thunk.
[handle]: Verify the URI. Adjust for thunking.
(with-http-server): Adjust for thunking.
---
guix/tests/http.scm | 35 +++++++++++++++++++++++++----------
1 file changed, 25 insertions(+), 10 deletions(-)
diff --git a/guix/tests/http.scm b/guix/tests/http.scm
index 2f65df4029..6af1948211 100644
--- a/guix/tests/http.scm
+++ b/guix/tests/http.scm
@@ -21,7 +21,9 @@
#:use-module (ice-9 threads)
#:use-module (web server)
#:use-module (web server http)
+ #:use-module (web request)
#:use-module (web response)
+ #:use-module (web uri)
#:use-module (srfi srfi-11)
#:use-module (srfi srfi-39)
#:use-module (ice-9 match)
@@ -144,7 +146,10 @@ It will also quit if LAST-RESPONSE? returns true."
(define* (call-with-http-server responses+data thunk #:key (keep-lingering? #false))
"Call THUNK with an HTTP server running and returning RESPONSES+DATA
on HTTP requests. Each element of RESPONSES+DATA must be a tuple containing a
-response and a string, or an HTTP response code and a string.
+response and a string, or an HTTP response code and a string. Alternatively,
+the elements can triples with the URI path (including the query, if any)
+as the first part of the triple. In that case, the request URI is verified
+against the URI in RESPONSES+DATA.
The argument RESPONSES+DATA is thunked. As such, RESPONSES+DATA can use
%http-server-port. %http-server-port will be set to the port listened at.
@@ -152,18 +157,28 @@ It will be set for the dynamic extent of THUNK and RESPONSES+DATA.
The server will exit after the last response. When KEEP-LINGERING? is false,
the server will also exit after THUNK returns."
+ (define (maybe-uri? object)
+ (or (string? object) (eq? object 'any)))
+ (define (sanitize-response+data response+data)
+ (match response+data
+ ((response data)
+ (sanitize-response+data (list 'any response data)))
+ (((? maybe-uri? uri) (? response? response) data)
+ (list uri response data))
+ (((? maybe-uri? uri) (? integer? code) data)
+ (list uri
+ (build-response #:code code
+ #:reason-phrase "Such is life")
+ data))))
(define (responses)
- (map (match-lambda
- (((? response? response) data)
- (list response data))
- (((? integer? code) data)
- (list (build-response #:code code
- #:reason-phrase "Such is life")
- data)))
- (responses+data)))
+ (map sanitize-response+data (responses+data)))
(define (handle request body)
(match (responses)
- (((response data) rest ...)
+ (((uri response data) rest ...)
+ (unless (or (eq? uri 'any)
+ (string=? uri (uri->string (request-uri request))))
+ (error "this URI should not be contacted!"
+ (request-uri request)))
(set! responses (const rest))
(values response data))))
(call-with-http-server* handle thunk #:keep-lingering? keep-lingering?
--
2.30.2
next prev parent reply other threads:[~2022-01-20 19:46 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-20 12:59 [bug#53389] [PATCH 0/9] Replace some mocking with with-http-server*, avoid hardcoding ports, Maxime Devos
2022-01-20 13:08 ` [bug#53389] [PATCH 1/9] tests: Support arbitrary HTTP request handlers Maxime Devos
2022-01-20 13:08 ` [bug#53389] [PATCH 2/9] tests: Generalise %local-url Maxime Devos
2022-01-20 13:08 ` [bug#53389] [PATCH 3/9] tests/minetest: Run a HTTP server instead of mocking Maxime Devos
2022-01-20 13:08 ` [bug#53389] [PATCH 4/9] tests/import-github: " Maxime Devos
2022-01-20 13:08 ` [bug#53389] [PATCH 5/9] tests/cpan: Do not hard code a HTTP port Maxime Devos
2022-01-20 13:08 ` [bug#53389] [PATCH 6/9] tests/lint: Do not assume the next port is free Maxime Devos
2022-01-20 13:08 ` Maxime Devos [this message]
2022-01-20 13:08 ` [bug#53389] [PATCH 8/9] tests/cpan: Verify URIs Maxime Devos
2022-01-20 13:08 ` [bug#53389] [PATCH 9/9] tests/challenge: Do not hard code HTTP ports Maxime Devos
2022-01-22 16:48 ` [bug#53389] [PATCH 0/9] Replace some mocking with with-http-server*, avoid hardcoding ports, Ludovic Courtès
2022-01-22 18:55 ` Maxime Devos
2022-01-25 7:54 ` Ludovic Courtès
2022-01-25 13:37 ` Maxime Devos
2022-02-07 9:53 ` Ludovic Courtès
2022-02-07 10:59 ` Maxime Devos
2022-03-06 16:23 ` Ludovic Courtès
2022-03-07 7:00 ` Maxime Devos
2022-01-22 19:21 ` Maxime Devos
2022-01-22 19:57 ` Maxime Devos
2022-01-22 20:42 ` Maxime Devos
2022-01-22 18:08 ` [bug#53389] [PATCH 1/9] tests: Support arbitrary HTTP request handlers Maxime Devos
2022-01-20 15:11 ` [bug#53389] [PATCH 0/9] Replace some mocking with with-http-server*, avoid hardcoding ports, Ludovic Courtès
2022-04-12 19:46 ` [bug#53389] [PATCH 0/9] Replace some mocking with with-http-server Maxime Devos
2022-04-21 15:20 ` [bug#53389] [PATCH v2 0/25] Replace some mocking with with-http-server*, avoid harcoding ports Maxime Devos
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220120130849.292178-7-maximedevos@telenet.be \
--to=maximedevos@telenet.be \
--cc=53389@debbugs.gnu.org \
--cc=ludo@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).