summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2014-08-20 18:16:46 +0100
committerSimon MacMullen <simon@rabbitmq.com>2014-08-20 18:16:46 +0100
commit36aa869f19d098280501c9c67fe6fa379e5b1b38 (patch)
treeff56b778188690c7d0abdb4a48c7479d0953ff3e /src
parentb4d0c121fc0d2507da17b7878dc7ffb7ebe4587e (diff)
downloadrabbitmq-server-36aa869f19d098280501c9c67fe6fa379e5b1b38.tar.gz
Make this test make sense for the new regime. There will of course need to be lots of new tests but at least this passes now.
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_tests.erl12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index a186fb7a..bd11e8bf 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -1666,16 +1666,12 @@ test_declare_on_dead_queue(SecondaryNode) ->
rabbit_amqqueue:declare(QueueName, false, false, [],
none),
exit(QPid, kill),
- Self ! {self(), killed, QPid}
+ Self ! {self(), killed}
end),
receive
- {Pid, killed, QPid} ->
- {existing, #amqqueue{name = QueueName,
- pid = QPid}} =
- rabbit_amqqueue:declare(QueueName, false, false, [], none),
- false = rabbit_misc:is_process_alive(QPid),
- {new, Q} = rabbit_amqqueue:declare(QueueName, false, false, [],
- none),
+ {Pid, killed} ->
+ {existing, Q} = rabbit_amqqueue:declare(QueueName, false, false, [],
+ none),
true = rabbit_misc:is_process_alive(Q#amqqueue.pid),
{ok, 0} = rabbit_amqqueue:delete(Q, false, false),
passed