|
93 | 93 | (try
|
94 | 94 | (request {:request-method :get :uri "/timeout" :socket-timeout 1})
|
95 | 95 | (is false "expected a throw")
|
96 |
| - (catch Exception ^Exception e |
97 |
| - (is (or (= "Read timed out" (.getMessage e)) |
98 |
| - (let [^Exception cause (.getCause e)] |
99 |
| - (= "Read timed out" (.getMessage cause)))))))) |
| 96 | + (catch Exception e |
| 97 | + (is (or (= java.net.SocketTimeoutException (class e)) |
| 98 | + (= java.net.SocketTimeoutException (class (.getCause e)))))))) |
100 | 99 |
|
101 | 100 | (deftest delete-with-body
|
102 | 101 | (let [resp (request {:request-method :delete :uri "/delete-with-body"
|
|
110 | 109 | :scheme :https
|
111 | 110 | :server-name "localhost"
|
112 | 111 | :server-port (:https-port *server*)}]
|
113 |
| - (try |
114 |
| - (request client-opts) |
115 |
| - (is false "expected a throw") |
116 |
| - (catch Exception ^Exception e |
117 |
| - (is (re-find #"SunCertPathBuilderException" (.getMessage e))))) |
| 112 | + (is (thrown? javax.net.ssl.SSLException |
| 113 | + (request client-opts))) |
118 | 114 | (let [resp (request (assoc client-opts :insecure? true))]
|
119 | 115 | (is (= 200 (:status resp)))
|
120 | 116 | (is (= "get" (slurp-body resp))))
|
121 |
| - (try |
122 |
| - (request client-opts) |
123 |
| - (is false "expected a throw") |
124 |
| - (catch Exception ^Exception e |
125 |
| - (is (re-find #"SunCertPathBuilderException" (.getMessage e))))))) |
| 117 | + (is (thrown? javax.net.ssl.SSLException |
| 118 | + (request client-opts))))) |
126 | 119 |
|
127 | 120 | (deftest t-save-request-obj
|
128 | 121 | (let [resp (request {:request-method :post :uri "/post"
|
|
0 commit comments