commit 15539105df26beb71b4de0e54348fbbc384b096d
author Junxiao Shi <git@mail1.yoursunny.com> Wed Oct 08 22:39:51 2014 -0700
committer Alex Afanasyev <alexander.afanasyev@ucla.edu> Thu Oct 09 16:13:00 2014 -0700
tree 0ddc0eb4d8d0e63a7ec54ddd1eb2aaa6a777d1aa
parent f9c2bb19fe6044381f1f4202c495e647e4a2e846

fw: optimize FwNccStrategy/FavorRespondingUpstream test case

This test case previously relies on precise timing, and the slack is 3ms
in the worst case. Failure rate is high if system is slow.
This commit optimizes this tests case with several operation-limited
io runs, so that it doesn't rely on precise timing.

refs #2037

Change-Id: I80b87d830dcf8d87fce511e79eb9349f75c1c34d

tests/daemon/fw/ncc-strategy.cpp

diff --git a/tests/daemon/fw/ncc-strategy.cpp b/tests/daemon/fw/ncc-strategy.cpp
index d8e1ef1..ef89bb1 100644
--- a/tests/daemon/fw/ncc-strategy.cpp
+++ b/tests/daemon/fw/ncc-strategy.cpp
@@ -75,12 +75,12 @@
   strategy->afterReceiveInterest(*face3, interest1, fibEntry, pitEntry1);
 
   // forwards to face1 because routing says it's best
-  limitedIo.run(LimitedIo::UNLIMITED_OPS, time::milliseconds(1));
+  // (no io run here: afterReceiveInterest has already sent the Interest)
   BOOST_REQUIRE_EQUAL(strategy->m_sendInterestHistory.size(), 1);
   BOOST_CHECK_EQUAL(strategy->m_sendInterestHistory[0].get<1>(), face1);
 
   // forwards to face2 because face1 doesn't respond
-  limitedIo.run(LimitedIo::UNLIMITED_OPS, time::milliseconds(500));
+  limitedIo.run(1, time::milliseconds(500));
   BOOST_REQUIRE_EQUAL(strategy->m_sendInterestHistory.size(), 2);
   BOOST_CHECK_EQUAL(strategy->m_sendInterestHistory[1].get<1>(), face2);
 
@@ -88,7 +88,7 @@
   shared_ptr<Data> data1p = makeData("ndn:/0Jm1ajrW/%00");
   Data& data1 = *data1p;
   strategy->beforeSatisfyInterest(pitEntry1, *face2, data1);
-  limitedIo.run(LimitedIo::UNLIMITED_OPS, time::milliseconds(500));
+  limitedIo.defer(time::milliseconds(500));
 
   // second Interest: strategy knows face2 is best
   shared_ptr<Interest> interest2p = makeInterest("ndn:/0Jm1ajrW/%00%01");
@@ -100,7 +100,7 @@
   strategy->afterReceiveInterest(*face3, interest2, fibEntry, pitEntry2);
 
   // forwards to face2 because it responds previously
-  limitedIo.run(LimitedIo::UNLIMITED_OPS, time::milliseconds(1));
+  limitedIo.defer(time::milliseconds(1));
   BOOST_REQUIRE_GE(strategy->m_sendInterestHistory.size(), 3);
   BOOST_CHECK_EQUAL(strategy->m_sendInterestHistory[2].get<1>(), face2);
 }