reduce number of race conditions in TC 1 (#4790)

bloomberg · Jun 13, 2024 · 650b64d · 650b64d
1 parent 0adf770
commit 650b64d
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/groups/bdl/bdlmt/bdlmt_eventscheduler.t.cpp b/groups/bdl/bdlmt/bdlmt_eventscheduler.t.cpp
@@ -7582,7 +7582,7 @@ int main(int argc, char *argv[])
 
           bsls::TimeInterval elapsed = u::now() - now;
           if (elapsed < T6) {
-              ASSERT( 0 == x.cancelEvent(h) );
+              ASSERT( 0 == x.cancelEventAndWait(h) );
               ASSERT( 0 != x.cancelEvent(h) );
 
               const int NEXEC = testObj.numExecuted();
@@ -7630,7 +7630,7 @@ int main(int argc, char *argv[])
 
           bsls::TimeInterval elapsed = u::now() - now;
           if (elapsed < T6) {
-              ASSERT( 0 == x.cancelEvent(h) );
+              ASSERT( 0 == x.cancelEventAndWait(h) );
               ASSERT( 0 != x.cancelEvent(h) );
 
               const int NEXEC = testObj.numExecuted();
@@ -7671,7 +7671,7 @@ int main(int argc, char *argv[])
                      T3,
                      bdlf::MemFnUtil::memFn(&TestClass1::callback, &testObj2));
 
-          x.cancelAllEvents();
+          x.cancelAllEventsAndWait();
           ASSERT( 0 != x.cancelEvent(h1) );
           ASSERT( 0 != x.cancelEvent(h2) );
 
@@ -7717,7 +7717,7 @@ int main(int argc, char *argv[])
                      T3,
                      bdlf::MemFnUtil::memFn(&TestClass1::callback, &testObj2));
 
-          x.cancelAllEvents();
+          x.cancelAllEventsAndWait();
           ASSERT( 0 != x.cancelEvent(h1) );
           ASSERT( 0 != x.cancelEvent(h2) );