summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2010-07-02 14:56:27 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2010-07-02 14:56:27 +0100
commita98b9aa64b79a0b536ec806b1811b87cbcd6eb45 (patch)
tree7ac779ce9305c31d6d43b3542a4152c8f03f384f /src
parentb84cecb52c1175b02a4184b3894a1410aa066467 (diff)
parent654ceb7ac2260ba5fb6b36827764a06ff88568bd (diff)
downloadrabbitmq-server-git-a98b9aa64b79a0b536ec806b1811b87cbcd6eb45.tar.gz
merge default into bug22889
and in the process remove yet another hard-coded protocol
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_tests.erl7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index 6d9d2d389c..960d9a9c6a 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -953,12 +953,7 @@ test_memory_pressure() ->
ok = test_memory_pressure_receive_flow(true),
%% if we publish at this point, the channel should die
- Content =
- #content{class_id = element(1, rabbit_framing_amqp_0_9_1:method_id(
- 'basic.publish')),
- properties = none,
- properties_bin = <<>>,
- payload_fragments_rev = []},
+ Content = rabbit_basic:build_content([], <<>>),
ok = rabbit_channel:do(Ch0, #'basic.publish'{}, Content),
expect_normal_channel_termination(MRef0, Ch0),