Commit 5a2b69ed authored by Thomas Markwalder's avatar Thomas Markwalder
Browse files

[master] Corrected intermittent D2 unit test failure

On sluggish machines D2UpdateMgrTest.multiTransactionTimeout
failed intermittantly. A run-away test check was a bit too
stringent.
parent a66dc23e
...@@ -213,7 +213,7 @@ public: ...@@ -213,7 +213,7 @@ public:
/// vary. /// vary.
void processAll(unsigned int timeout_millisec = void processAll(unsigned int timeout_millisec =
NameChangeTransaction::DNS_UPDATE_DEFAULT_TIMEOUT + 100, NameChangeTransaction::DNS_UPDATE_DEFAULT_TIMEOUT + 100,
size_t max_passes = 20) { size_t max_passes = 100) {
// Loop until all the transactions have been dequeued and run through to // Loop until all the transactions have been dequeued and run through to
// completion. // completion.
size_t passes = 0; size_t passes = 0;
...@@ -238,9 +238,9 @@ public: ...@@ -238,9 +238,9 @@ public:
} }
// This is a last resort fail safe to ensure we don't go around // This is a last resort fail safe to ensure we don't go around
// forever. We cut it off the number of passes at 20. This is // forever. We cut it off the number of passes at 100 (default
// roughly twice the number for the longest test (currently, // value). This is roughly ten times the number for the longest
// multiTransactionTimeout). // test (currently, multiTransactionTimeout).
if (passes > max_passes) { if (passes > max_passes) {
ADD_FAILURE() << "processALL failed, too many passes: " ADD_FAILURE() << "processALL failed, too many passes: "
<< passes << ", total handlers executed: " << handlers; << passes << ", total handlers executed: " << handlers;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment