Strings are overkill for parmap_test.

[simgrid.git] / teshsuite / s4u / activity-lifecycle / testing_test-wait.cpp

diff --git a/teshsuite/s4u/activity-lifecycle/testing_test-wait.cpp b/teshsuite/s4u/activity-lifecycle/testing_test-wait.cpp
index 0e15dcd1e3a88142f084d07f4f692a7428c61b41..421ff1530071d2c0fadc6092308f7ab413e1a231 100644 (file)
--- a/teshsuite/s4u/activity-lifecycle/testing_test-wait.cpp
+++ b/teshsuite/s4u/activity-lifecycle/testing_test-wait.cpp
@@ -224,10 +224,12 @@ TEST_CASE("Activity test/wait: using <tester_wait<0>>")
   XBT_INFO("#####[ launch next test ]#####");
 
   RUN_SECTION("exec: run and wait<0> once", test_trivial<ExecPtr, create_exec, tester_wait<0>>);
-  // exec: run and wait<0> many
+  RUN_SECTION("exec: run and wait<0> many", test_basic<ExecPtr, create_exec, tester_wait<0>>);
   RUN_SECTION("exec: cancel and wait<0>", test_cancel<ExecPtr, create_exec, tester_wait<0>>);
-  // exec: actor failure and wait<0> / sleep
-  // exec: host failure and wait<0> / sleep
+  RUN_SECTION("exec: actor failure and wait<0> / sleep",
+              test_failure_actor<ExecPtr, create_exec, tester_wait<0>, waiter_sleep6>);
+  RUN_SECTION("exec: host failure and wait<0> / sleep",
+              test_failure_host<ExecPtr, create_exec, tester_wait<0>, waiter_sleep6>);
   // exec: actor failure and wait<0> / wait
   // exec: host failure and wait<0> / wait
 
@@ -298,23 +300,15 @@ TEST_CASE("Activity test/wait: tests currently failing", "[.][failing]")
   XBT_INFO("#####[ launch next failing test ]#####");
 
   // with tester_wait<0>
-  // -> wait_for() should return immediately and signal a timeout (timeout == 0)
-  RUN_SECTION("exec: run and wait<0> many", test_basic<ExecPtr, create_exec, tester_wait<0>>);
-  // -> wait_for() should return immediately and signal a timeout (timeout == 0)
-  RUN_SECTION("exec: actor failure and wait<0> / sleep",
-              test_failure_actor<ExecPtr, create_exec, tester_wait<0>, waiter_sleep6>);
-  // -> wait_for() should return immediately and signal a timeout (timeout == 0)
-  RUN_SECTION("exec: host failure and wait<0> / sleep",
-              test_failure_host<ExecPtr, create_exec, tester_wait<0>, waiter_sleep6>);
-  // -> wait_for() should return immediately and signal a timeout (timeout == 0)
+  // -> actor should not be killed by TimeoutException
   RUN_SECTION("exec: actor failure and wait<0> / wait",
               test_failure_actor<ExecPtr, create_exec, tester_wait<0>, waiter_wait>);
-  // -> wait_for() should return immediately and signal a timeout (timeout == 0)
+  // -> actor should not be killed by TimeoutException
   RUN_SECTION("exec: host failure and wait<0> / wait",
               test_failure_host<ExecPtr, create_exec, tester_wait<0>, waiter_wait>);
 
   // with tester_wait<1>
-  // -> second call to wait_for() should wait for timeuout and not return immediately
+  // -> second call to wait_for() should wait for timeout and not return immediately
   RUN_SECTION("exec: run and wait<1> many", test_basic<ExecPtr, create_exec, tester_wait<1>>);
   // -> second call to wait_for() should report a failure, and not a timeout
   RUN_SECTION("exec: actor failure and wait<1> / sleep",