From: Arnaud Giersch Date: Mon, 3 May 2021 10:46:44 +0000 (+0200) Subject: Fixed tests in activity-lifecycle/testing_test-wait. X-Git-Tag: v3.28~366 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/8a2f287f2a54e9f7825472989b0d9e3dbadbfc50?ds=sidebyside Fixed tests in activity-lifecycle/testing_test-wait. Close simgrid/simgrid#47 --- diff --git a/ChangeLog b/ChangeLog index 9ea5af1a56..fee4399bf2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,10 @@ LUA: XBT: - xbt_assert is not disabled anymore, even when built with enable_debug=off. +Fixed bugs (FG#.. -> FramaGit bugs; FG!.. -> FG merge requests) + (FG: issues on Framagit; GF: issues on GForge; GH: issues on GitHub) + - FG#47: Complete and fix tests from teshuite/s4u/activity-lifecycle + ---------------------------------------------------------------------------- SimGrid (3.27) March 29. 2021 diff --git a/teshsuite/s4u/activity-lifecycle/testing_test-wait.cpp b/teshsuite/s4u/activity-lifecycle/testing_test-wait.cpp index 421ff15300..2668936623 100644 --- a/teshsuite/s4u/activity-lifecycle/testing_test-wait.cpp +++ b/teshsuite/s4u/activity-lifecycle/testing_test-wait.cpp @@ -230,8 +230,10 @@ TEST_CASE("Activity test/wait: using >") test_failure_actor, waiter_sleep6>); RUN_SECTION("exec: host failure and wait<0> / sleep", test_failure_host, waiter_sleep6>); - // exec: actor failure and wait<0> / wait - // exec: host failure and wait<0> / wait + RUN_SECTION("exec: actor failure and wait<0> / wait", + test_failure_actor, waiter_wait>); + RUN_SECTION("exec: host failure and wait<0> / wait", + test_failure_host, waiter_wait>); simgrid::s4u::this_actor::sleep_for(10); assert_cleanup(); @@ -242,12 +244,16 @@ TEST_CASE("Activity test/wait: using >") XBT_INFO("#####[ launch next test ]#####"); RUN_SECTION("exec: run and wait<1> once", test_trivial>); - // exec: run and wait<1> many + RUN_SECTION("exec: run and wait<1> many", test_basic>); RUN_SECTION("exec: cancel and wait<1>", test_cancel>); - // exec: actor failure and wait<1> / sleep - // exec: host failure and wait<1> / sleep - // exec: actor failure and wait<1> / wait - // exec: host failure and wait<1> / wait + RUN_SECTION("exec: actor failure and wait<1> / sleep", + test_failure_actor, waiter_sleep6>); + RUN_SECTION("exec: host failure and wait<1> / sleep", + test_failure_host, waiter_sleep6>); + RUN_SECTION("exec: actor failure and wait<1> / wait", + test_failure_actor, waiter_wait>); + RUN_SECTION("exec: host failure and wait<1> / wait", + test_failure_host, waiter_wait>); simgrid::s4u::this_actor::sleep_for(10); assert_cleanup(); @@ -292,37 +298,3 @@ TEST_CASE("Activity test/wait: using >") simgrid::s4u::this_actor::sleep_for(10); assert_cleanup(); } - -// FIXME: The tests grouped here are currently failing. Once fixed, they should be put in the right section above. -// The tests can be activated with run-time parameter '*' or, more specifically '[failing]' -TEST_CASE("Activity test/wait: tests currently failing", "[.][failing]") -{ - XBT_INFO("#####[ launch next failing test ]#####"); - - // with tester_wait<0> - // -> actor should not be killed by TimeoutException - RUN_SECTION("exec: actor failure and wait<0> / wait", - test_failure_actor, waiter_wait>); - // -> actor should not be killed by TimeoutException - RUN_SECTION("exec: host failure and wait<0> / wait", - test_failure_host, waiter_wait>); - - // with tester_wait<1> - // -> second call to wait_for() should wait for timeout and not return immediately - RUN_SECTION("exec: run and wait<1> many", test_basic>); - // -> second call to wait_for() should report a failure, and not a timeout - RUN_SECTION("exec: actor failure and wait<1> / sleep", - test_failure_actor, waiter_sleep6>); - // -> second call to wait_for() should report a failure, and not a timeout - RUN_SECTION("exec: host failure and wait<1> / sleep", - test_failure_host, waiter_sleep6>); - // -> actor should not be killed by TimeoutException - RUN_SECTION("exec: actor failure and wait<1> / wait", - test_failure_actor, waiter_wait>); - // -> actor should not be killed by TimeoutException - RUN_SECTION("exec: host failure and wait<1> / wait", - test_failure_host, waiter_wait>); - - simgrid::s4u::this_actor::sleep_for(10); - assert_cleanup(); -}