From: Loic Dachary <loic@dachary.org>
Date: Mon, 12 Aug 2013 13:20:57 +0000 (+0200)
Subject: remove racy test assertions
X-Git-Tag: v0.68~73^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F499%2Fhead;p=ceph.git

remove racy test assertions

Do not assert before the loop waiting for the thread to complete the
expected side effect. The whole point of the loop is to make sure
there is no window of opportunity for a race condition and asserting
before it means taking a useless risk. If run enough times, it will
happen.

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/src/test/test_osd_types.cc b/src/test/test_osd_types.cc
index fa4ae6163ac7..730a8ffdc5d0 100644
--- a/src/test/test_osd_types.cc
+++ b/src/test/test_osd_types.cc
@@ -1081,11 +1081,6 @@ TEST_F(ObjectContextTest, read_write_lock)
 
     obc.ondisk_write_unlock();
 
-    EXPECT_EQ(1, obc.readers_waiting);
-    EXPECT_EQ(0, obc.readers);
-    EXPECT_EQ(0, obc.writers_waiting);
-    EXPECT_EQ(0, obc.unstable_writes);
-
     do {
       cout << "Trying (2) with delay " << delay << "us\n";
       usleep(delay);
@@ -1144,11 +1139,6 @@ TEST_F(ObjectContextTest, read_write_lock)
 
     obc.ondisk_read_unlock();
 
-    EXPECT_EQ(0, obc.readers_waiting);
-    EXPECT_EQ(0, obc.readers);
-    EXPECT_EQ(1, obc.writers_waiting);
-    EXPECT_EQ(0, obc.unstable_writes);
-
     do {
       cout << "Trying (4) with delay " << delay << "us\n";
       usleep(delay);