per-query timeout tests

mabrek · Apr 27, 2012 · 51c5e90 · 51c5e90
1 parent 4ebb7bb
commit 51c5e90
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/test_src/pgsql_tests.erl b/test_src/pgsql_tests.erl
@@ -532,25 +532,23 @@ query_timeout_test(Module) ->
     with_connection(
       Module,
       fun(C) ->
-              {error, timeout} = Module:squery(C, "select pg_sleep(1)"),
-              {error, timeout} = Module:equery(C, "select pg_sleep(2)"),
-              {ok, _Cols, [{1}]} = Module:equery(C, "select 1")
-      end,
-      [{timeout, 10}]).
+              {error, timeout} = Module:squery(C, "select pg_sleep(1)", 10),
+              {error, timeout} = Module:equery(C, "select pg_sleep(2)", [], 10),
+              {ok, _Cols, [{1}]} = Module:equery(C, "select 1", [], 10)
+      end).
 
 execute_timeout_test(Module) ->
     with_connection(
       Module,
       fun(C) ->
               {ok, S} = Module:parse(C, "select pg_sleep($1)"),
               ok = Module:bind(C, S, [2]),
-              {error, timeout} = Module:execute(C, S, 0),
+              {error, timeout} = Module:execute(C, S, "", 0, 10),
               ok = Module:bind(C, S, [0]),
-              {ok, [{<<>>}]} = Module:execute(C, S, 0),
+              {ok, [{<<>>}]} = Module:execute(C, S, "", 0, 10),
               ok = Module:close(C, S),
               ok = Module:sync(C)
-      end,
-      [{timeout, 10}]).
+      end).
 
 connection_closed_test(Module) ->
     P = self(),