Rename test helper to not be confusable with a test

Author: DerGuteMoritz

test/aleph/http_test.clj

@@ -1313,7 +1313,7 @@
           (is (= "" (bs/to-string (:body resp)))))))))
 
 
-(defn test-start-server-options [options]
+(defn try-start-server [options]
   (try
     (with-server (http/start-server identity (merge http-server-options options))
       :started)
@@ -1323,44 +1323,44 @@
 (deftest test-http-versions-config
   (testing "ssl-context as options map"
     (testing "with different HTTP versions in ALPN config"
-      (let [result (test-start-server-options
+      (let [result (try-start-server
                     {:http-versions [:http2]
                      :ssl-context (assoc test-ssl/server-ssl-context-opts
                                          :application-protocol-config
                                          (netty/application-protocol-config [:http1]))})]
         (is (instance? ExceptionInfo result))
         (is (= "Some desired HTTP versions are not part of ALPN config." (ex-message result)))))
     (testing "with different preference order in ALPN config"
-      (let [result (test-start-server-options
+      (let [result (try-start-server
                     {:http-versions [:http2 :http1]
                      :ssl-context (assoc test-ssl/server-ssl-context-opts
                                          :application-protocol-config
                                          (netty/application-protocol-config [:http1 :http2]))})]
         (is (instance? ExceptionInfo result))
         (is (= "Desired HTTP version preference order differs from ALPN config." (ex-message result)))))
     (testing "with extra HTTP versions in the ALPN config"
-      (let [result (test-start-server-options
+      (let [result (try-start-server
                     {:http-versions [:http1]
                      :ssl-context (assoc test-ssl/server-ssl-context-opts
                                          :application-protocol-config
                                          (netty/application-protocol-config [:http1 :http2]))})]
         (is (instance? ExceptionInfo result))
         (is (= "ALPN config contains more HTTP versions than desired." (ex-message result)))))
     (testing "with matching ALPN config"
-      (let [result (test-start-server-options
+      (let [result (try-start-server
                     {:http-versions [:http2 :http1]
                      :ssl-context (assoc test-ssl/server-ssl-context-opts
                                          :application-protocol-config
                                          (netty/application-protocol-config [:http2 :http1]))})]
         (is (= :started result))))
     (testing "with no ALPN config"
-      (let [result (test-start-server-options
+      (let [result (try-start-server
                     {:http-versions [:http2 :http1]
                      :ssl-context test-ssl/server-ssl-context-opts})]
         (is (= :started result)))))
   (testing "ssl-context as SslContext instance"
     (testing "with different HTTP versions in ALPN config"
-      (let [result (test-start-server-options
+      (let [result (try-start-server
                     {:http-versions [:http2]
                      :ssl-context (netty/coerce-ssl-server-context
                                    (assoc test-ssl/server-ssl-context-opts
@@ -1369,7 +1369,7 @@
         (is (instance? ExceptionInfo result))
         (is (= "Some desired HTTP versions are not part of ALPN config." (ex-message result)))))
     (testing "with different preference order in ALPN config"
-      (let [result (test-start-server-options
+      (let [result (try-start-server
                     {:http-versions [:http2 :http1]
                      :ssl-context (netty/coerce-ssl-server-context
                                    (assoc test-ssl/server-ssl-context-opts
@@ -1378,40 +1378,40 @@
         (is (instance? ExceptionInfo result))
         (is (= "Desired HTTP version preference order differs from ALPN config." (ex-message result)))))
     (testing "with extra HTTP versions in the ALPN config"
-      (let [result (test-start-server-options
+      (let [result (try-start-server
                     {:http-versions [:http1]
-                     :ssl-context (netty/coerce-ssl-server-context
+                     :ssl-context (netty/ssl-server-context
                                    (assoc test-ssl/server-ssl-context-opts
                                           :application-protocol-config
                                           (netty/application-protocol-config [:http1 :http2])))})]
         (is (instance? ExceptionInfo result))
         (is (= "ALPN config contains more HTTP versions than desired." (ex-message result)))))
     (testing "with matching ALPN config"
-      (let [result (test-start-server-options
+      (let [result (try-start-server
                     {:http-versions [:http2 :http1]
                      :ssl-context (netty/coerce-ssl-server-context
                                    (assoc test-ssl/server-ssl-context-opts
                                           :application-protocol-config
                                           (netty/application-protocol-config [:http2 :http1])))})]
         (is (= :started result))))
     (testing "with no ALPN config"
-      (let [result (test-start-server-options
+      (let [result (try-start-server
                     {:http-versions [:http2 :http1]
                      :ssl-context test-ssl/server-ssl-context})]
         (is (instance? ExceptionInfo result))
         (is (= "Some desired HTTP versions are not part of ALPN config." (ex-message result))))))
   (testing "HTTP/2 without ssl-context"
-    (let [result (test-start-server-options
+    (let [result (try-start-server
                   {:http-versions [:http2]})]
       ;; TODO: Shouldn't this fail?
       (is (= :started result))))
   (testing "HTTP/2 without ssl-context but with h2c"
-    (let [result (test-start-server-options
+    (let [result (try-start-server
                   {:use-h2c? true
                    :http-versions [:http2]})]
       (is (= :started result))))
   (testing "HTTP/2 with ssl-context *and* with h2c (which has no effect then)"
-    (let [result (test-start-server-options
+    (let [result (try-start-server
                   {:use-h2c? true
                    :http-versions [:http2]
                    :ssl-context test-ssl/server-ssl-context-opts})]