Revalidate tests, now that detached sends are not cancelled anymore.

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

diff --git a/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp b/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp
index 37b0410..be1e495 100644 (file)
--- a/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp
+++ b/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp
@@ -271,16 +271,10 @@ static void test_comm_dsend_and_quit_put_before_get()
 
   simgrid::s4u::Actor::create("receiver", all_hosts[2], [&recv_done]() {
     assert_exit(false, 3);
-    bool got_exception = false;
     simgrid::s4u::this_actor::sleep_for(2);
-    try {
-      void* payload = simgrid::s4u::Mailbox::by_name("mb")->get();
-      xbt_free(payload);
-    } catch (xbt_ex const& e) {
-      got_exception = true;
-    }
+    void* payload = simgrid::s4u::Mailbox::by_name("mb")->get();
+    xbt_free(payload);
     recv_done = true;
-    xbt_assert(not got_exception);
     return;
   });
 
@@ -297,7 +291,7 @@ static void test_comm_dsend_and_quit_get_before_put()
   bool recv_done  = false;
 
   simgrid::s4u::ActorPtr sender = simgrid::s4u::Actor::create("sender", all_hosts[1], [&dsend_done]() {
-    //assert_exit(false, 2);
+    assert_exit(false, 2);
     char* payload = xbt_strdup("toto");
     simgrid::s4u::this_actor::sleep_for(2);
     simgrid::s4u::Mailbox::by_name("mb")->put_init(payload, 1000)->detach();
@@ -306,16 +300,10 @@ static void test_comm_dsend_and_quit_get_before_put()
   });
 
   simgrid::s4u::Actor::create("receiver", all_hosts[2], [&recv_done]() {
-    //assert_exit(false, 3);
-    bool got_exception = false;
-    try {
-      void* payload = simgrid::s4u::Mailbox::by_name("mb")->get();
-      xbt_free(payload);
-    } catch (xbt_ex const& e) {
-      got_exception = true;
-    }
+    assert_exit(false, 3);
+    void* payload = simgrid::s4u::Mailbox::by_name("mb")->get();
+    xbt_free(payload);
     recv_done = true;
-    xbt_assert(not got_exception);
     return;
   });
 
@@ -433,7 +421,7 @@ static void main_dispatcher()
 
   run_test("comm", test_comm);
   run_test("comm dsend and quit (put before get)", test_comm_dsend_and_quit_put_before_get);
-  // run_test("comm dsend and quit (get before put)", test_comm_dsend_and_quit_get_before_put); FAILING
+  run_test("comm dsend and quit (get before put)", test_comm_dsend_and_quit_get_before_put);
   run_test("comm kill sender", test_comm_killsend);
 
   //run_test("comm recv and kill", test_host_off_while_receive);