tests/qampqpexchange: skip test if rabbitmq does not support reject p…

…ublish References: jira PAM-5269
mbroadst · May 25, 2018 · a06fd67 · a06fd67
1 parent dd0aed0
commit a06fd67
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/tests/auto/qamqpexchange/tst_qamqpexchange.cpp b/tests/auto/qamqpexchange/tst_qamqpexchange.cpp
@@ -285,6 +285,11 @@ void tst_QAMQPExchange::testRejectedMessagePublish()
 
     QVERIFY(exchange->waitForConfirms());
 
+    if (deliveryConfirmedSpy.count() == 2)
+      {
+        SKIP("The AMQP server does not support x-overflow: reject-publish. For rabbitmq, it requires version >=3.7 (Skipped test)");
+      }
+
     QCOMPARE(deliveryConfirmedSpy.count(), 1);
     QCOMPARE(deliveryConfirmedSpy.first().first().toLongLong(), firstDeliveryTag);
 

diff --git a/tests/common/qamqptestcase.h b/tests/common/qamqptestcase.h
@@ -6,6 +6,12 @@
 
 #include "qamqpqueue.h"
 
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#define SKIP(x) QSKIP(x)
+#else
+#define SKIP(x) QSKIP(x, SkipAll)
+#endif
+
 class TestCase : public QObject
 {
 public: