face: use IncomingFaceId, NextHopFaceId, CachePolicy tags
This commit replaces all LocalControlHeader usages with these tags,
and deletes LocalFace.
This commit also does minor improvements in RIB test suites.
refs #3339
Change-Id: I14cbfc296a6723a5860bf8bd95d9804d3bac3da5
diff --git a/tests/rib/auto-prefix-propagator.t.cpp b/tests/rib/auto-prefix-propagator.t.cpp
index 67e7b1b..3699815 100644
--- a/tests/rib/auto-prefix-propagator.t.cpp
+++ b/tests/rib/auto-prefix-propagator.t.cpp
@@ -457,15 +457,15 @@
BOOST_REQUIRE_EQUAL(m_requests.size(), 1);
BOOST_CHECK_EQUAL(checkRequest(0, "register", "/test/A"), CheckRequestResult::OK);
- advanceClocks(time::milliseconds(1), 1050); // wait for the 1st retry
+ advanceClocks(time::milliseconds(10), time::milliseconds(1050)); // wait for the 1st retry
BOOST_REQUIRE_EQUAL(m_requests.size(), 2);
BOOST_CHECK_EQUAL(checkRequest(1, "register", "/test/A"), CheckRequestResult::OK);
- advanceClocks(time::milliseconds(1), 2050); // wait for the 2nd retry, 2 times
+ advanceClocks(time::milliseconds(10), time::milliseconds(2050)); // wait for the 2nd retry, 2 times
BOOST_REQUIRE_EQUAL(m_requests.size(), 3);
BOOST_CHECK_EQUAL(checkRequest(2, "register", "/test/A"), CheckRequestResult::OK);
- advanceClocks(time::milliseconds(1), 2050); // wait for the 3rd retry, reach the upper bound
+ advanceClocks(time::milliseconds(10), time::milliseconds(2050)); // wait for the 3rd retry, reach the upper bound
BOOST_REQUIRE_EQUAL(m_requests.size(), 4);
BOOST_CHECK_EQUAL(checkRequest(3, "register", "/test/A"), CheckRequestResult::OK);
}