removed accidental test race condition

ros · Aug 12, 2017 · 507299f · 507299f
1 parent e6aa520
commit 507299f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/test/test_roscpp/test/test_callback_queue.cpp b/test/test_roscpp/test/test_callback_queue.cpp
@@ -439,9 +439,8 @@ void ConditionObject::add()
 {
   while(!condition_stop.load())
   {
-    if(condition_sync.load())
+    if(condition_sync.load() && queue->isEmpty())
     {
-      condition_sync.store(false);
       condition_one.store(true);
       id++;
       queue->addCallback(boost::make_shared<RaceConditionCallback>(this, &id), id);
@@ -458,6 +457,7 @@ TEST(CallbackQueue, raceConditionCallback)
   boost::thread t(boost::bind(&ConditionObject::add, &condition_object));
   for(unsigned int i = 0; i < 1000000; ++i)
   {
+    condition_object.condition_sync.store(false);
     if (queue.callOne() == CallbackQueue::Called)
     {
       if(condition_object.condition_one.load())