From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 14 Mar 2016 02:14:28 +0000 (-0400)
Subject: test: remove broken negative test cases
X-Git-Tag: v10.1.0~103^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a60f38df61541fee26e75233181ddd122b34e569;p=ceph.git

test: remove broken negative test cases

These should be reimplemented using google mock instead of
virtual functions.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/test/rbd_mirror/test_ImageReplayer.cc b/src/test/rbd_mirror/test_ImageReplayer.cc
index b1e2ccf48f8..0399bd4a72a 100644
--- a/src/test/rbd_mirror/test_ImageReplayer.cc
+++ b/src/test/rbd_mirror/test_ImageReplayer.cc
@@ -533,12 +533,6 @@ protected:
 	bootstrap_params);
   }
 
-  virtual void on_start_bootstrap_finish(int r) {
-    ASSERT_EQ(0, r);
-    rbd::mirror::ImageReplayer::on_start_bootstrap_finish(
-      get_error("on_start_bootstrap"));
-  }
-
   virtual void on_start_remote_journaler_init_finish(int r) {
     ASSERT_EQ(0, r);
     rbd::mirror::ImageReplayer::on_start_remote_journaler_init_finish(
@@ -563,12 +557,6 @@ protected:
     close_local_image(ctx);
   }
 
-  virtual void on_start_local_image_lock_finish(int r) {
-    ASSERT_EQ(0, r);
-    rbd::mirror::ImageReplayer::on_start_local_image_lock_finish(
-      get_error("on_start_local_image_lock"));
-  }
-
   virtual void on_start_wait_for_local_journal_ready_finish(int r) {
     ASSERT_EQ(0, r);
     rbd::mirror::ImageReplayer::on_start_wait_for_local_journal_ready_finish(
@@ -622,13 +610,9 @@ TEST_F(TestImageReplayer, Error_on_stop_##state)			\
 }
 
 TEST_ON_START_ERROR(get_registered_client_status);
-TEST_ON_START_ERROR(bootstrap);
 TEST_ON_START_ERROR(remote_journaler_init);
-TEST_ON_START_ERROR(local_image_open);
-TEST_ON_START_ERROR(local_image_lock);
 TEST_ON_START_ERROR(wait_for_local_journal_ready);
 
 TEST_ON_STOP_ERROR(journal_replay_shut_down);
-TEST_ON_STOP_ERROR(local_image_close);
 TEST_ON_STOP_ERROR(no_error);