]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
test/common/test_weighted_priority_queue Fix the unit tests since the 7654/head
authorRobert LeBlanc <robert.leblanc@endurance.com>
Mon, 15 Feb 2016 17:52:05 +0000 (17:52 +0000)
committerRobert LeBlanc <robert.leblanc@endurance.com>
Tue, 23 Feb 2016 20:42:52 +0000 (20:42 +0000)
changes to WeightedPriorityQueue there is no strict round robin
dequeueing of classes. Removed that test from the unittest.

Signed-off-by: Robert LeBlanc <robert.leblanc@endurance.com>
src/test/common/test_weighted_priority_queue.cc

index d3ebc4199cfb382c2b6f88f45eb3b5e9ecf4396e..b8519794b6e1e97ea2e77ca4db63922eb40a9c96 100644 (file)
@@ -114,13 +114,6 @@ protected:
         // in the strict queue.
         LQ::reverse_iterator ri = strictq.rbegin();
         EXPECT_EQ(std::get<0>(r), ri->first);
-        // Check that if there are multiple classes in a priority
-        // that it is not dequeueing the same class each time.
-        LastKlass::iterator si = last_strict.find(std::get<0>(r));
-        if (strictq[std::get<0>(r)].size() > 1 && si != last_strict.end()) {
-         EXPECT_NE(std::get<1>(r), si->second);
-       }
-        last_strict[std::get<0>(r)] = std::get<1>(r);
 
        Item t = strictq[std::get<0>(r)][std::get<1>(r)].front().second;
         EXPECT_EQ(std::get<2>(r), std::get<2>(t));
@@ -132,14 +125,6 @@ protected:
          strictq.erase(std::get<0>(r));
        }
       } else {
-        // Check that if there are multiple classes in a priority
-        // that it is not dequeueing the same class each time.
-        LastKlass::iterator si = last_norm.find(std::get<0>(r));
-        if (normq[std::get<0>(r)].size() > 1 && si != last_norm.end()) {
-         EXPECT_NE(std::get<1>(r), si->second);
-       }
-        last_norm[std::get<0>(r)] = std::get<1>(r);
-
        Item t = normq[std::get<0>(r)][std::get<1>(r)].front().second;
         EXPECT_EQ(std::get<2>(r), std::get<2>(t));
         normq[std::get<0>(r)][std::get<1>(r)].pop_front();