Tests: fix flakey message logs; ignore delete worker failures

Close gh-5432

2 files changed, 13 insertions, 7 deletions

diff --git a/test/runner/browserstack/browsers.js b/test/runner/browserstack/browsers.js
index 957c9aac8..3a7da4fc9 100644
--- a/test/runner/browserstack/browsers.js
+++ b/test/runner/browserstack/browsers.js
@@ -187,13 +187,19 @@ export async function cleanupAllBrowsers( { verbose } ) {
 	const workersRemaining = Object.values( workers );
 	const numRemaining = workersRemaining.length;
 	if ( numRemaining ) {
-		await Promise.all(
-			workersRemaining.map( ( worker ) => deleteWorker( worker.id ) )
-		);
-		if ( verbose ) {
-			console.log(
-				`Stopped ${ numRemaining } browser${ numRemaining > 1 ? "s" : "" }.`
+		try {
+			await Promise.all(
+				workersRemaining.map( ( worker ) => deleteWorker( worker.id ) )
 			);
+			if ( verbose ) {
+				console.log(
+					`Stopped ${ numRemaining } browser${ numRemaining > 1 ? "s" : "" }.`
+				);
+			}
+		} catch ( error ) {
+
+			// Log the error, but do not consider the test run failed
+			console.error( error );
 		}
 	}
 }
diff --git a/test/runner/browserstack/queue.js b/test/runner/browserstack/queue.js
index 10ef14a2b..c948f29bf 100644
--- a/test/runner/browserstack/queue.js
+++ b/test/runner/browserstack/queue.js
@@ -39,7 +39,7 @@ export function retryTest( reportId, maxRetries ) {
 			console.log(
 				`Retrying test ${ reportId } for ${ chalk.yellow(
 					test.options.modules.join( ", " )
-				) }...`
+				) }...${ test.retries }`
 			);
 			return test;
 		}