From 4fdcd6c92f82aa3b69b2bc3090ccc87be78e2a67 Mon Sep 17 00:00:00 2001
From: Duarte Nunes <duarte@scylladb.com>
Date: Fri, 16 Feb 2018 19:10:50 +0000
Subject: [PATCH] tests/serialized_action_test: Don't rely on task execution
 order

Signed-off-by: Duarte Nunes <duarte@scylladb.com>
Message-Id: <20180216191050.21902-1-duarte@scylladb.com>
---
 tests/serialized_action_test.cc | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/serialized_action_test.cc b/tests/serialized_action_test.cc
index ddd80a5fa5..f09cc83ff2 100644
--- a/tests/serialized_action_test.cc
+++ b/tests/serialized_action_test.cc
@@ -21,6 +21,7 @@
 
 #include <boost/test/unit_test.hpp>
 #include <seastar/core/thread.hh>
+#include <seastar/core/semaphore.hh>
 #include "utils/serialized_action.hh"
 #include "tests/test-utils.hh"
 #include "utils/phased_barrier.hh"
@@ -30,8 +31,10 @@ SEASTAR_TEST_CASE(test_serialized_action_triggering) {
         int current = 0;
         std::vector<int> history;
         promise<> p;
+        seastar::semaphore sem{0};
 
         serialized_action act([&] {
+            sem.signal(1);
             auto val = current;
             return p.get_future().then([&, val] {
                 history.push_back(val);
@@ -43,7 +46,7 @@ SEASTAR_TEST_CASE(test_serialized_action_triggering) {
         };
 
         auto t1 = act.trigger();
-        later().get(); // wait for t1 action to block
+        sem.wait().get(); // wait for t1 action to block
         current = 1;
         auto t2 = act.trigger();
         auto t3 = act.trigger();
@@ -57,7 +60,7 @@ SEASTAR_TEST_CASE(test_serialized_action_triggering) {
         BOOST_REQUIRE(!t2.available());
         BOOST_REQUIRE(!t3.available());
 
-        later().get(); // wait for t2 action to block
+        sem.wait().get(); // wait for t2 action to block
         current = 3;
         auto t4 = act.trigger();
         release();
@@ -68,7 +71,7 @@ SEASTAR_TEST_CASE(test_serialized_action_triggering) {
         BOOST_REQUIRE(history.back() == 2);
         BOOST_REQUIRE(!t4.available());
 
-        later().get(); // wait for t4 action to block
+        sem.wait().get(); // wait for t4 action to block
         current = 4;
         release();
 
@@ -78,7 +81,7 @@ SEASTAR_TEST_CASE(test_serialized_action_triggering) {
 
         current = 5;
         auto t5 = act.trigger();
-        later().get(); // wait for t5 action to block
+        sem.wait().get(); // wait for t5 action to block
         release();
         t5.get();