X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/368914fb8daebc6d2d2cd58ab4645974b14216c2..1ec7b8025855665055344d2c02b0e32aa58aaecc:/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 be1e495d52..abba7c815e 100644
--- a/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp
+++ b/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp
@@ -358,6 +358,7 @@ static void test_host_off_while_receive()
   bool returned_from_main = false;
   bool in_catch_before_on_exit = false;
   bool in_catch_after_on_exit = false;
+  bool send_done               = false;
 
   simgrid::s4u::ActorPtr receiver = simgrid::s4u::Actor::create(
     "receiver", all_hosts[1], 
@@ -366,9 +367,11 @@ static void test_host_off_while_receive()
        try {
          simgrid::s4u::Mailbox::by_name("mb")->get();
        } catch (simgrid::HostFailureException const&) {
+         // Shouldn't get in here
          in_catch_before_on_exit = not in_on_exit;
          in_catch_after_on_exit = in_on_exit;
        } catch (simgrid::NetworkFailureException const&) {
+         // Shouldn't get in here
          in_catch_before_on_exit = not in_on_exit;
          in_catch_after_on_exit = in_on_exit;
        }
@@ -377,12 +380,18 @@ static void test_host_off_while_receive()
 
   receiver->on_exit([&in_on_exit](bool) { in_on_exit = true; });
 
-  simgrid::s4u::ActorPtr sender = simgrid::s4u::Actor::create(
-    "sender", all_hosts[2], 
-    []() {
-      int data;
+  simgrid::s4u::ActorPtr sender = simgrid::s4u::Actor::create("sender", all_hosts[2], [&send_done]() {
+    assert_exit(false, 1);
+    bool got_exception = false;
+    try {
+      int data = 42;
       simgrid::s4u::Mailbox::by_name("mb")->put(&data, 100000);
-    });
+    } catch (simgrid::NetworkFailureException const&) {
+      got_exception = true;
+    }
+    xbt_assert(got_exception);
+    send_done = true;
+  });
 
   simgrid::s4u::this_actor::sleep_for(1);
   receiver->get_host()->turn_off();
@@ -398,6 +407,7 @@ static void test_host_off_while_receive()
     "Receiver mistakenly went to catch clause (after the on_exit function was called)");
   xbt_assert(not returned_from_main, 
     "Receiver returned from main normally even though its host was killed");
+  xbt_assert(send_done, "Sender killed somehow. It shouldn't");
 }
 
 /* We need an extra actor here, so that it can sleep until the end of each test */
@@ -424,7 +434,7 @@ static void main_dispatcher()
   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);
+  run_test("comm recv and kill", test_host_off_while_receive);
 }
 
 int main(int argc, char* argv[])