commit 55e21b9e17708fb2581e7eb6ee582283a82035c7
author Junxiao Shi <git@mail1.yoursunny.com> Mon Jan 23 03:27:47 2017 +0000
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Jan 25 09:29:02 2017 -0500
tree fb88dd96df61e0d50b47e2cb23e39016bd216857
parent 7d30d8556a79f30ff573a6dba260431dc7a943e7

table: clear StrategyInfo only if Strategy type differs

refs #3868

Change-Id: I164ccba3bd6c69cef9d2ebba303f8d8d941aac99

tests/daemon/table/strategy-choice.t.cpp

diff --git a/tests/daemon/table/strategy-choice.t.cpp b/tests/daemon/table/strategy-choice.t.cpp
index 7dd0e1a..eeba048 100644
--- a/tests/daemon/table/strategy-choice.t.cpp
+++ b/tests/daemon/table/strategy-choice.t.cpp
@@ -289,7 +289,6 @@
   }
 };
 
-BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES(ClearStrategyInfo, 2)
 BOOST_AUTO_TEST_CASE(ClearStrategyInfo)
 {
   Measurements& measurements = forwarder.getMeasurements();
@@ -305,14 +304,14 @@
   // { '/'=>P, '/A/B'=>P }
   BOOST_CHECK(measurements.get("/").getStrategyInfo<PStrategyInfo>() != nullptr);
   BOOST_CHECK(measurements.get("/A").getStrategyInfo<PStrategyInfo>() != nullptr);
-  BOOST_CHECK(measurements.get("/A/B").getStrategyInfo<PStrategyInfo>() != nullptr); // expected failure
+  BOOST_CHECK(measurements.get("/A/B").getStrategyInfo<PStrategyInfo>() != nullptr);
   BOOST_CHECK(measurements.get("/A/C").getStrategyInfo<PStrategyInfo>() != nullptr);
 
   BOOST_CHECK(sc.insert("/A", strategyNameQ));
   // { '/'=>P, '/A/B'=>P, '/A'=>Q }
   BOOST_CHECK(measurements.get("/").getStrategyInfo<PStrategyInfo>() != nullptr);
   BOOST_CHECK(measurements.get("/A").getStrategyInfo<PStrategyInfo>() == nullptr);
-  BOOST_CHECK(measurements.get("/A/B").getStrategyInfo<PStrategyInfo>() != nullptr); // expected failure
+  BOOST_CHECK(measurements.get("/A/B").getStrategyInfo<PStrategyInfo>() != nullptr);
   BOOST_CHECK(measurements.get("/A/C").getStrategyInfo<PStrategyInfo>() == nullptr);
 
   sc.erase("/A/B");