diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-01-06 03:59:31 +0800 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-01-06 03:59:31 +0800 |
| commit | e4a6e388d017bed82ae2fd6eabea30920263afcc (patch) | |
| tree | 69b4a44a5ee449cbdc87ace63ad3673974de3e95 | |
| parent | 9a40523c863f3e3a9f212364689ac8c47acaeca5 (diff) | |
| parent | 62d8e67571af1f5e90e1e5864c5f7ca101d2c0c2 (diff) | |
| download | rabbitmq-server-git-e4a6e388d017bed82ae2fd6eabea30920263afcc.tar.gz | |
Merge branch 'stable' into rabbitmq-server-1054
Conflicts:
test/worker_pool_SUITE.erl
| -rw-r--r-- | test/worker_pool_SUITE.erl | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/test/worker_pool_SUITE.erl b/test/worker_pool_SUITE.erl index 5a673430ab..9b6b0721a2 100644 --- a/test/worker_pool_SUITE.erl +++ b/test/worker_pool_SUITE.erl @@ -41,7 +41,7 @@ end_per_testcase(_, Config) -> unlink(Pool), exit(Pool, kill). -run_code_synchronously(_Config) -> +run_code_synchronously(_) -> Self = self(), Test = make_ref(), Sleep = 200, @@ -63,7 +63,7 @@ run_code_synchronously(_Config) -> % Worker is a separate process true = (Self /= Result). -run_code_asynchronously(_Config) -> +run_code_asynchronously(_) -> Self = self(), Test = make_ref(), Sleep = 200, @@ -84,7 +84,7 @@ run_code_asynchronously(_Config) -> % Worker is a separate process true = (Self /= Result). -set_timeout(_Config) -> +set_timeout(_) -> Self = self(), Test = make_ref(), Worker = worker_pool:submit(?POOL_NAME, @@ -112,7 +112,7 @@ set_timeout(_Config) -> end. -cancel_timeout(_Config) -> +cancel_timeout(_) -> Self = self(), Test = make_ref(), Worker = worker_pool:submit(?POOL_NAME, @@ -146,7 +146,7 @@ cancel_timeout(_Config) -> after 0 -> ok end. -cancel_timeout_by_setting(_Config) -> +cancel_timeout_by_setting(_) -> Self = self(), Test = make_ref(), Worker = worker_pool:submit(?POOL_NAME, @@ -186,8 +186,3 @@ cancel_timeout_by_setting(_Config) -> receive {hello_reset, Worker, Test} -> ok after 1000 -> exit(timeout_is_late) end. - - - - - |