Merge pull request #1820 from AntelopeIO/GH-1815-test-stuck-main

[5.0 -> main] Test Fix: Avoid deadlock on app_thread
AntelopeIO · Oct 24, 2023 · a9fa4dc · a9fa4dc
2 parents a427cc2 + 38e68e6
commit a9fa4dc
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/tests/test_read_only_trx.cpp b/tests/test_read_only_trx.cpp
@@ -118,6 +118,7 @@ void test_trxs_common(std::vector<const char*>& specific_args, bool test_disable
             BOOST_CHECK(!"app threw exception see logged error");
          } );
          fc::scoped_exit<std::function<void()>> on_except = [&](){
+            app->quit();
             if (app_thread.joinable())
                app_thread.join();
          };
@@ -166,8 +167,6 @@ void test_trxs_common(std::vector<const char*>& specific_args, bool test_disable
          while ( (next_calls < num_pushes || num_get_account_calls < num_pushes) && fc::time_point::now() < hard_deadline ){
             std::this_thread::sleep_for( 100ms );
          }
-
-         app->quit();
       }
 
       BOOST_CHECK_EQUAL( trace_with_except, 0u ); // should not have any traces with except in it