Merge pull request #1986 from AllenInstitute/bugfix/1986-stop-zeromq-…

…after-all-tests Tests: Call zeromq_stop after the complete test run
AllenInstitute · Jan 22, 2024 · 4f5076a · 4f5076a
2 parents e68b5ba + e4bb933
commit 4f5076a
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 0 deletions.
diff --git a/Packages/tests/Basic/UTF_Basic.ipf b/Packages/tests/Basic/UTF_Basic.ipf
@@ -141,6 +141,10 @@ Function TEST_BEGIN_OVERRIDE(string name)
 	TestBeginCommon()
 End
 
+Function TEST_END_OVERRIDE(string name)
+	TestEndCommon()
+End
+
 Function TEST_CASE_BEGIN_OVERRIDE(name)
 	string name
 

diff --git a/Packages/tests/HistoricData/UTF_HistoricData.ipf b/Packages/tests/HistoricData/UTF_HistoricData.ipf
@@ -104,6 +104,10 @@ Function TEST_BEGIN_OVERRIDE(string name)
 	TestBeginCommon()
 End
 
+Function TEST_END_OVERRIDE(string name)
+	TestEndCommon()
+End
+
 Function TEST_CASE_BEGIN_OVERRIDE(name)
 	string name
 

diff --git a/Packages/tests/PAPlot/UTF_PA_Tests.ipf b/Packages/tests/PAPlot/UTF_PA_Tests.ipf
@@ -423,6 +423,10 @@ static Function TEST_BEGIN_OVERRIDE(string name)
 	TestBeginCommon()
 End
 
+static Function TEST_END_OVERRIDE(string name)
+	TestEndCommon()
+End
+
 static Function TEST_CASE_END_OVERRIDE(string testcase)
 	CheckForBugMessages()
 

diff --git a/Packages/tests/UTF_HardwareHelperFunctions.ipf b/Packages/tests/UTF_HardwareHelperFunctions.ipf
@@ -48,6 +48,10 @@ Function TEST_BEGIN_OVERRIDE(name)
 	TestBeginCommon()
 End
 
+Function TEST_END_OVERRIDE(string name)
+	TestEndCommon()
+End
+
 Function TEST_CASE_BEGIN_OVERRIDE(name)
 	string name
 

diff --git a/Packages/tests/UTF_HelperFunctions.ipf b/Packages/tests/UTF_HelperFunctions.ipf
@@ -740,6 +740,11 @@ Function TestBeginCommon()
 	MEN_ClearPackageSettings()
 End
 
+Function TestEndCommon()
+
+	zeromq_stop()
+End
+
 Function SetAsyncChannelProperties(string device, WAVE asyncChannels, variable minValue, variable maxValue)
 	variable chan
 	string ctrl, title, unit