test: txindex: interrupt threadGroup before calling destructor

MarcoFalke · MarcoFalke · commit fab6b07c1676 · 2019-02-14T14:40:49.000-05:00
diff --git a/src/test/txindex_tests.cpp b/src/test/txindex_tests.cpp
@@ -69,7 +69,13 @@ BOOST_FIXTURE_TEST_CASE(txindex_initial_sync, TestChain100Setup)
         }
     }
 
-    txindex.Stop(); // Stop thread before calling destructor
+    // shutdown sequence (c.f. Shutdown() in init.cpp)
+    txindex.Stop();
+
+    threadGroup.interrupt_all();
+    threadGroup.join_all();
+
+    // Rest of shutdown sequence and destructors happen in ~TestingSetup()
 }
 
 BOOST_AUTO_TEST_SUITE_END()

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,13 @@ BOOST_FIXTURE_TEST_CASE(txindex_initial_sync, TestChain100Setup)`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`- txindex.Stop(); // Stop thread before calling destructor`
	`72`	`+ // shutdown sequence (c.f. Shutdown() in init.cpp)`
	`73`	`+ txindex.Stop();`
	`74`	`+`
	`75`	`+ threadGroup.interrupt_all();`
	`76`	`+ threadGroup.join_all();`
	`77`	`+`
	`78`	`+ // Rest of shutdown sequence and destructors happen in ~TestingSetup()`
`73`	`79`	`}`
`74`	`80`
`75`	`81`	`BOOST_AUTO_TEST_SUITE_END()`