Merge pull request #97 from puzza007/remove-docker-for-tests

Use cowboy instead of docker for unix socket test

Author: puzza007

.travis.yml

@@ -4,9 +4,6 @@ group: edge
 
 language: erlang
 
-services:
-  - docker
-
 install:
   - ORIG_DIR=$PWD
   - wget https://github.com/erlang/rebar3/releases/download/3.10.0/rebar3 && chmod 755 rebar3
@@ -29,7 +26,7 @@ before_install:
 
 cache:
   directories:
-  - $HOME/.cache/rebar3/
+    - $HOME/.cache/rebar3/
 
 addons:
   apt:

rebar.config

@@ -15,7 +15,8 @@
    [{deps,
      [{jsx, "2.9.0"},
       {meck, "0.8.10"},
-      {cowboy, "2.4.0"},
+      {cowboy, "2.6.3"},
+      {ephemeral, "2.0.4"},
       {http_proxy, ".*", {git, "https://github.com/puzza007/http_proxy.git", {branch, "rebar3"}}}
      ]}]
   }]

test/katipo_SUITE.erl

@@ -19,6 +19,13 @@ init_per_suite(Config) ->
 end_per_suite(_Config) ->
     ok = application:stop(katipo).
 
+init_per_group(http, Config) ->
+    application:ensure_all_started(cowboy),
+    Filename = tempfile:name("katipo_test_"),
+    Dispatch = cowboy_router:compile([{'_', [{"/unix", get_handler, []}]}]),
+    {ok, _} = cowboy:start_clear(unix_socket, [{ip, {local, Filename}},
+                                               {port, 0}], #{env => #{dispatch => Dispatch}}),
+    [{unix_socket_file, Filename} | Config];
 init_per_group(session, Config) ->
     application:ensure_all_started(katipo),
     Config;
@@ -43,6 +50,10 @@ init_per_group(proxy, Config) ->
 init_per_group(_, Config) ->
     Config.
 
+end_per_group(http, Config) ->
+    Filename = ?config(unix_socket_file, Config),
+    _ = file:delete(Filename),
+    Config;
 end_per_group(pool, Config) ->
     application:stop(meck),
     Config;
@@ -425,10 +436,11 @@ interface_unknown(_) ->
     {error, #{code := interface_failed}} =
         katipo:get(?POOL, <<"https://httpbin.org/get">>, #{interface => <<"cannot_be_an_interface">>}).
 
-unix_socket_path(_) ->
-    case katipo:get(?POOL, <<"http://localhost/images/json">>, #{unix_socket_path => <<"/var/run/docker.sock">>}) of
+unix_socket_path(Config) ->
+    Filename = list_to_binary(?config(unix_socket_file, Config)),
+    case katipo:get(?POOL, <<"http://localhost/unix">>, #{unix_socket_path => Filename}) of
         {ok, #{status := 200, headers := Headers}} ->
-            <<"Docker/",_/binary>> = proplists:get_value(<<"Server">>, Headers);
+            <<"Cowboy">> = proplists:get_value(<<"server">>, Headers);
         {error, #{code := bad_opts}} ->
             ct:pal("unix_socket_path not supported by installed version of curl"),
             ok