projects/guix·blob python-team · refs

243 lines · 9.2 KiB

1Remove tests that cannot be run. Some depend on clack, which in turn
2depends on lack. Others refer to systems that don't exist
3(names starting with "t-").
4
5--- a/lack-component.asd
6+++ b/lack-component.asd
7@@ -2,7 +2,6 @@
8 :version "0.2.0"
9 :author "Eitaro Fukamachi"
10 :license "MIT"
11- :components ((:file "src/component"))
12- :in-order-to ((test-op (test-op "t-lack-component"))))
13+ :components ((:file "src/component")))
14
15 (register-system-packages "lack-component" '(:lack.component))
16diff --git a/lack-middleware-accesslog.asd b/lack-middleware-accesslog.asd
17index c593988..21a4e70 100644
18--- a/lack-middleware-accesslog.asd
19+++ b/lack-middleware-accesslog.asd
20@@ -6,7 +6,6 @@
21 "local-time")
22 :components ((:module "src"
23 :components
24- ((:file "middleware/accesslog"))))
25- :in-order-to ((test-op (test-op "t-lack-middleware-accesslog"))))
26+ ((:file "middleware/accesslog")))))
27
28 (register-system-packages "lack-middleware-accesslog" '(:lack.middleware.accesslog))
29diff --git a/lack-middleware-auth-basic.asd b/lack-middleware-auth-basic.asd
30index 9206d22..6862f33 100644
31--- a/lack-middleware-auth-basic.asd
32+++ b/lack-middleware-auth-basic.asd
33@@ -6,7 +6,6 @@
34 "split-sequence")
35 :components ((:module "src"
36 :components
37- ((:file "middleware/auth/basic"))))
38- :in-order-to ((test-op (test-op "t-lack-middleware-auth-basic"))))
39+ ((:file "middleware/auth/basic")))))
40
41 (register-system-packages "lack-middleware-auth-basic" '(:lack.middleware.auth.basic))
42diff --git a/lack-middleware-backtrace.asd b/lack-middleware-backtrace.asd
43index 8df7f9f..cf73f81 100644
44--- a/lack-middleware-backtrace.asd
45+++ b/lack-middleware-backtrace.asd
46@@ -3,7 +3,6 @@
47 :author "Eitaro Fukamachi"
48 :license "MIT"
49 :depends-on ("uiop")
50- :components ((:file "src/middleware/backtrace"))
51- :in-order-to ((test-op (test-op "t-lack-middleware-backtrace"))))
52+ :components ((:file "src/middleware/backtrace")))
53
54 (register-system-packages "lack-middleware-backtrace" '(:lack.middleware.backtrace))
55diff --git a/lack-middleware-csrf.asd b/lack-middleware-csrf.asd
56index 105d3bb..fcf46f7 100644
57--- a/lack-middleware-csrf.asd
58+++ b/lack-middleware-csrf.asd
59@@ -6,7 +6,6 @@
60 "lack-util")
61 :components ((:module "src"
62 :components
63- ((:file "middleware/csrf"))))
64- :in-order-to ((test-op (test-op "t-lack-middleware-csrf"))))
65+ ((:file "middleware/csrf")))))
66
67 (register-system-packages "lack-middleware-csrf" '(:lack.middleware.csrf))
68diff --git a/lack-middleware-session.asd b/lack-middleware-session.asd
69index 92b1568..bed4c89 100644
70--- a/lack-middleware-session.asd
71+++ b/lack-middleware-session.asd
72@@ -19,7 +19,6 @@
73 :pathname "session"
74 :components
75 ((:file "state")
76- (:file "state/cookie"))))))
77- :in-order-to ((test-op (test-op "t-lack-middleware-session"))))
78+ (:file "state/cookie")))))))
79
80 (register-system-packages "lack-middleware-session" '(:lack.middleware.session))
81diff --git a/lack-middleware-static.asd b/lack-middleware-static.asd
82index a0ce627..107a386 100644
83--- a/lack-middleware-static.asd
84+++ b/lack-middleware-static.asd
85@@ -7,7 +7,6 @@
86 "alexandria")
87 :components ((:module "src"
88 :components
89- ((:file "middleware/static"))))
90- :in-order-to ((test-op (test-op "t-lack-middleware-static"))))
91+ ((:file "middleware/static")))))
92
93 (register-system-packages "lack-middleware-static" '(:lack.middleware.static))
94diff --git a/lack-request.asd b/lack-request.asd
95index 5efa05c..240b421 100644
96--- a/lack-request.asd
97+++ b/lack-request.asd
98@@ -9,7 +9,6 @@
99 :components ((:module "src"
100 :components
101 ((:file "request" :depends-on ("media-type"))
102- (:file "media-type"))))
103- :in-order-to ((test-op (test-op "t-lack-request"))))
104+ (:file "media-type")))))
105
106 (register-system-packages "lack-request" '(:lack.request))
107diff --git a/lack-session-store-dbi.asd b/lack-session-store-dbi.asd
108index 00e7d1e..825a96c 100644
109--- a/lack-session-store-dbi.asd
110+++ b/lack-session-store-dbi.asd
111@@ -7,7 +7,6 @@
112 "marshal"
113 "trivial-utf-8"
114 "cl-base64")
115- :components ((:file "src/middleware/session/store/dbi"))
116- :in-order-to ((test-op (test-op "t-lack-session-store-dbi"))))
117+ :components ((:file "src/middleware/session/store/dbi")))
118
119 (register-system-packages "lack-session-store-dbi" '(:lack.session.store.dbi))
120diff --git a/lack-session-store-redis.asd b/lack-session-store-redis.asd
121index 96b0504..57e4046 100644
122--- a/lack-session-store-redis.asd
123+++ b/lack-session-store-redis.asd
124@@ -7,7 +7,6 @@
125 "marshal"
126 "cl-base64"
127 "trivial-utf-8")
128- :components ((:file "src/middleware/session/store/redis"))
129- :in-order-to ((test-op (test-op "t-lack-session-store-redis"))))
130+ :components ((:file "src/middleware/session/store/redis")))
131
132 (register-system-packages "lack-session-store-redis" '(:lack.session.store.redis))
133diff --git a/lack-util.asd b/lack-util.asd
134index 0391a1b..1318c04 100644
135--- a/lack-util.asd
136+++ b/lack-util.asd
137@@ -5,7 +5,6 @@
138 :depends-on ((:feature (:or :windows :mswindows :win32 :cormanlisp) "ironclad")
139 (:feature (:not (:or :windows :mswindows :win32 :cormanlisp)) "cl-isaac")
140 "bordeaux-threads")
141- :components ((:file "src/util"))
142- :in-order-to ((test-op (test-op "t-lack-util"))))
143+ :components ((:file "src/util")))
144
145 (register-system-packages "lack-util" '(:lack.util))
146diff --git a/lack.asd b/lack.asd
147index e213c10..dde71cf 100644
148--- a/lack.asd
149+++ b/lack.asd
150@@ -43,8 +43,6 @@
151 "lack/middleware/auth/basic"
152 "lack/session/store/redis"
153 "lack/session/store/dbi"
154- "clack"
155- "clack-test"
156 "hunchentoot"
157 "dexador"
158 "cl-cookie"
159@@ -60,7 +58,6 @@
160 :serial t
161 :components ((:file "builder")
162 (:file "util")
163- (:file "request")
164 (:file "component")
165 (:file "media-type")
166 (:module "middleware"
167diff --git a/tests/request.lisp b/tests/request.lisp
168deleted file mode 100644
169index 3fd26e0..0000000
170--- a/tests/request.lisp
171+++ /dev/null
172@@ -1,71 +0,0 @@
173-(defpackage #:lack/tests/request
174- (:use #:cl
175- #:rove
176- #:lack/request
177- #:clack.test
178- #:flexi-streams)
179- (:import-from #:dexador)
180- (:import-from #:alexandria
181- #:alist-hash-table))
182-(in-package #:lack/tests/request)
183-
184-(defparameter *request*
185- (make-request `(:content-type "application/x-www-form-urlencoded; charset=utf-8"
186- :content-length 20
187- :uri-scheme :http
188- :query-string "ediweitz=weitzedi&name=eitaro&q=C%2B%2B"
189- :raw-body
190- ,(flex:make-flexi-stream
191- (flex:make-in-memory-input-stream
192- #(110 97 109 101 61 230 183 177 231 148 186 232 139 177 229 164 170 233 131 142))
193- :external-format :utf-8)
194- :headers ,(alexandria:alist-hash-table
195- '(("referer" . "http://github.com/fukamachi/clack")
196- ("user-agent" . "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_6; en-US)")
197- ("accept" . "text/html")
198- ("cookie" . "hoge=1;fuga=semi;colon"))
199- :test 'equal))))
200-
201-(deftest lack-request
202- (ok (typep *request* 'request))
203-
204- (ok (request-env *request*) "request-env")
205-
206- (ok (equal (request-content-type *request*) "application/x-www-form-urlencoded; charset=utf-8")
207- "request-content-type")
208-
209- (ok (equalp (request-query-parameters *request*)
210- '(("ediweitz" . "weitzedi") ("name" . "eitaro") ("q" . "C++")))
211- "request-query-parameters")
212-
213- (ok (equalp (request-body-parameters *request*)
214- `(("name" . ,(flex:octets-to-string
215- #(230 183 177 231 148 186 232 139 177 229 164 170 233 131 142)
216- :external-format :utf-8))))
217- "request-body-parameters")
218-
219- (ok (equalp (request-cookies *request*)
220- '(("hoge" . "1") ("fuga" . "semi") ("colon")))
221- "request-cookies")
222-
223- (ok (request-accepts-p *request* "text/html"))
224-
225- (ng (request-accepts-p *request* "application/json"))
226-
227- (testing-app "make-request"
228- (lambda (env)
229- (make-request env)
230- `(200 nil (,(third (assoc "file" (request-body-parameters (make-request env)) :test #'string=)))))
231- (multiple-value-bind (body status)
232- (dex:post (localhost)
233- :content
234- `(("file" . ,(asdf:system-relative-pathname :lack #P"data/jellyfish.jpg"))))
235- (ok (eql status 200))
236- (ok (equal body "jellyfish.jpg")))
237-
238- (multiple-value-bind (body status)
239- (dex:post (localhost)
240- :content
241- `(("file" . ,(asdf:system-relative-pathname :lack #P"data/jellyfish.jpg"))))
242- (ok (eql status 200))
243- (ok (equal body "jellyfish.jpg")))))