From: Sage Weil <sage@redhat.com>
Date: Sun, 24 Feb 2019 15:36:57 +0000 (-0600)
Subject: ceph_test_msgr: skip injection test for simplemessenger
X-Git-Tag: v14.1.1~148^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F26609%2Fhead;p=ceph.git

ceph_test_msgr: skip injection test for simplemessenger

The interceptor is only implemented in asyncmessenger.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/test/msgr/test_msgr.cc b/src/test/msgr/test_msgr.cc
index 18cfb8e994af..cbeee9bb1ac4 100644
--- a/src/test/msgr/test_msgr.cc
+++ b/src/test/msgr/test_msgr.cc
@@ -339,6 +339,10 @@ struct TestInterceptor : public Interceptor {
  * Scenario: A connects to B, and B connects to A at the same time.
  */ 
 TEST_P(MessengerTest, ConnectionRaceTest) {
+  if (string(GetParam()) == "simple") {
+    return;
+  }
+
   FakeDispatcher cli_dispatcher(false), srv_dispatcher(false);
 
   TestInterceptor *cli_interceptor = new TestInterceptor();
@@ -427,6 +431,10 @@ TEST_P(MessengerTest, ConnectionRaceTest) {
  *    - A reconnects
  */ 
 TEST_P(MessengerTest, MissingServerIdenTest) {
+  if (string(GetParam()) == "simple") {
+    return;
+  }
+
   FakeDispatcher cli_dispatcher(false), srv_dispatcher(false);
 
   TestInterceptor *cli_interceptor = new TestInterceptor();
@@ -507,6 +515,10 @@ TEST_P(MessengerTest, MissingServerIdenTest) {
  *    - B reconnects to A
  */ 
 TEST_P(MessengerTest, MissingServerIdenTest2) {
+  if (string(GetParam()) == "simple") {
+    return;
+  }
+
   FakeDispatcher cli_dispatcher(false), srv_dispatcher(false);
 
   TestInterceptor *cli_interceptor = new TestInterceptor();
@@ -578,6 +590,10 @@ TEST_P(MessengerTest, MissingServerIdenTest2) {
  *    - A reconnects
  */ 
 TEST_P(MessengerTest, ReconnectTest) {
+  if (string(GetParam()) == "simple") {
+    return;
+  }
+
   FakeDispatcher cli_dispatcher(false), srv_dispatcher(true);
 
   TestInterceptor *cli_interceptor = new TestInterceptor();
@@ -676,6 +692,10 @@ TEST_P(MessengerTest, ReconnectTest) {
  *    - A reconnects // B reconnects
  */ 
 TEST_P(MessengerTest, ReconnectRaceTest) {
+  if (string(GetParam()) == "simple") {
+    return;
+  }
+
   FakeDispatcher cli_dispatcher(false), srv_dispatcher(true);
 
   TestInterceptor *cli_interceptor = new TestInterceptor();