Browse Source

eliminate potential silent failures from connection tests

Will 15 years ago
parent
commit
054c342a1c
1 changed files with 9 additions and 4 deletions
  1. 9 4
      test_src/pgsql_tests.erl

+ 9 - 4
test_src/pgsql_tests.erl

@@ -10,10 +10,10 @@
 -define(port, 5432).
 -define(port, 5432).
 
 
 connect_test() ->
 connect_test() ->
-    connect_only([[]]).
+    connect_only([]).
 
 
 connect_to_db_test() ->
 connect_to_db_test() ->
-    connect_only([[{database, "epgsql_test_db1"}]]).
+    connect_only([{database, "epgsql_test_db1"}]).
 
 
 connect_as_test() ->
 connect_as_test() ->
     connect_only(["epgsql_test", [{database, "epgsql_test_db1"}]]).
     connect_only(["epgsql_test", [{database, "epgsql_test_db1"}]]).
@@ -482,7 +482,13 @@ run_tests() ->
 %% -- internal functions --
 %% -- internal functions --
 
 
 connect_only(Args) ->
 connect_only(Args) ->
-    {ok, C} = apply(pgsql, connect, [?host, [{port, ?port} | Args]]),
+    TestOpts = [{port, ?port}],
+    case Args of
+        [User, Opts]       -> Args2 = [User, TestOpts ++ Opts];
+        [User, Pass, Opts] -> Args2 = [User, Pass, TestOpts ++ Opts];
+        Opts               -> Args2 = [TestOpts ++ Opts]
+    end,
+    {ok, C} = apply(pgsql, connect, [?host | Args2]),
     pgsql:close(C),
     pgsql:close(C),
     flush().
     flush().
 
 
@@ -552,4 +558,3 @@ flush(Acc) ->
     after
     after
         0 -> lists:reverse(Acc)
         0 -> lists:reverse(Acc)
     end.
     end.
-