Fixed #249 When groups "include" in suite, ResultUpdator not awaiting

for completion
qmetry · Mar 17, 2019 · 3ffe9ec · 3ffe9ec
1 parent d58b1d1
commit 3ffe9ec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/com/qmetry/qaf/automation/core/TestBaseProvider.java b/src/com/qmetry/qaf/automation/core/TestBaseProvider.java
@@ -27,6 +27,7 @@
 import java.util.Iterator;
 import java.util.Vector;
 
+import com.qmetry.qaf.automation.integration.ResultUpdator;
 import com.qmetry.qaf.automation.ui.webdriver.ChromeDriverHelper;
 
 /**
@@ -96,6 +97,7 @@ public void run() {
 				TestBaseProvider.instance().prepareForShutDown();
 				TestBaseProvider.instance().stopAll();
 				ChromeDriverHelper.teardownService();
+				ResultUpdator.awaitTermination();
 			}
 		});
 	}

diff --git a/src/com/qmetry/qaf/automation/testng/TestNGTestCase.java b/src/com/qmetry/qaf/automation/testng/TestNGTestCase.java
@@ -95,7 +95,7 @@ final public void setupMethod(Method m, ITestContext context) {
 		this.context = context;
 	}
 
-	@AfterSuite
+	@AfterSuite(alwaysRun = true)
 	final public void afterSuit(ITestContext testContext) {
 		TestBaseProvider.instance().stopAll();
 		ResultUpdator.awaitTermination();