e2e: Fix issues with tests in CI (#45753)

* Try running fewer threads * trying some updates * Try some updated packages * Take back magellan so logging works * update yarn
Automattic · Sep 19, 2020 · c6ce401 · c6ce401
1 parent d5381f2
commit c6ce401
Show file tree

Hide file tree

Showing 15 changed files with 196 additions and 151 deletions.
diff --git a/test/e2e/.mocharc.yml b/test/e2e/.mocharc.yml
@@ -0,0 +1,7 @@
+require:
+  - 'esm'
+  - 'test/mocha.env.js'
+  - 'mocha-steps'
+file:
+  - 'lib/before.js'
+  - 'lib/mocha-hooks.js'
diff --git a/test/e2e/magellan-2fa.json b/test/e2e/magellan-2fa.json
@@ -1,6 +1,5 @@
 {
 	"mocha_tests": [ "specs" ],
-	"mocha_opts": "test/mocha.opts",
 	"mocha_args": "-R spec-xunit-reporter",
 	"max_test_attempts": 3,
 	"max_workers": 3,

diff --git a/test/e2e/magellan-canary.json b/test/e2e/magellan-canary.json
@@ -1,6 +1,5 @@
 {
 	"mocha_tests": [ "specs" ],
-	"mocha_opts": "test/mocha.opts",
 	"mocha_args": "-R spec-xunit-reporter",
 	"max_test_attempts": 3,
 	"max_workers": 3,

diff --git a/test/e2e/magellan-i18n-nux.json b/test/e2e/magellan-i18n-nux.json
@@ -1,6 +1,5 @@
 {
 	"mocha_tests": [ "specs/wp-signup-spec.js" ],
-	"mocha_opts": "test/mocha.opts",
 	"mocha_args": "-R spec-xunit-reporter",
 	"max_test_attempts": 2,
 	"max_workers": 3,

diff --git a/test/e2e/magellan-i18n.json b/test/e2e/magellan-i18n.json
@@ -1,6 +1,5 @@
 {
 	"mocha_tests": [ "specs-i18n/" ],
-	"mocha_opts": "test/mocha.opts",
 	"mocha_args": "-R spec-xunit-reporter",
 	"max_test_attempts": 1,
 	"max_workers": 1,

diff --git a/test/e2e/magellan-ie11-canary.json b/test/e2e/magellan-ie11-canary.json
@@ -1,6 +1,5 @@
 {
 	"mocha_tests": [ "specs/" ],
-	"mocha_opts": "test/mocha.opts",
 	"mocha_args": "-R spec-xunit-reporter",
 	"max_test_attempts": 6,
 	"max_workers": 1,

diff --git a/test/e2e/magellan-ie11.json b/test/e2e/magellan-ie11.json
@@ -1,6 +1,5 @@
 {
 	"mocha_tests": [ "specs/" ],
-	"mocha_opts": "test/mocha.opts",
 	"mocha_args": "-R spec-xunit-reporter",
 	"max_test_attempts": 6,
 	"max_workers": 1,

diff --git a/test/e2e/magellan-jetpack-canary.json b/test/e2e/magellan-jetpack-canary.json
@@ -1,6 +1,5 @@
 {
 	"mocha_tests": [ "specs-jetpack-calypso" ],
-	"mocha_opts": "test/mocha.opts",
 	"mocha_args": "-R spec-xunit-reporter",
 	"max_test_attempts": 2,
 	"max_workers": 3,

diff --git a/test/e2e/magellan-jetpack.json b/test/e2e/magellan-jetpack.json
@@ -1,6 +1,5 @@
 {
 	"mocha_tests": [ "specs", "specs-jetpack-calypso", "specs-blocks" ],
-	"mocha_opts": "test/mocha.opts",
 	"mocha_args": "-R spec-xunit-reporter",
 	"max_test_attempts": 3,
 	"max_workers": 3,

diff --git a/test/e2e/magellan-safari-canary.json b/test/e2e/magellan-safari-canary.json
@@ -1,6 +1,5 @@
 {
 	"mocha_tests": [ "specs/" ],
-	"mocha_opts": "test/mocha.opts",
 	"mocha_args": "-R spec-xunit-reporter",
 	"max_test_attempts": 3,
 	"max_workers": 1,

diff --git a/test/e2e/magellan-woocommerce.json b/test/e2e/magellan-woocommerce.json
@@ -1,6 +1,5 @@
 {
 	"mocha_tests": [ "specs-woocommerce" ],
-	"mocha_opts": "test/mocha.opts",
 	"mocha_args": "-R spec-xunit-reporter",
 	"max_test_attempts": 2,
 	"max_workers": 6,

diff --git a/test/e2e/magellan.json b/test/e2e/magellan.json
@@ -1,6 +1,5 @@
 {
 	"mocha_tests": [ "specs" ],
-	"mocha_opts": "test/mocha.opts",
 	"mocha_args": "-R spec-xunit-reporter",
 	"max_test_attempts": 3,
 	"max_workers": 7,

diff --git a/test/e2e/package.json b/test/e2e/package.json
@@ -46,8 +46,8 @@
 		"junit-viewer": "^4.9.6",
 		"lodash": "^4.13.1",
 		"mailosaur": "^4.0.0",
-		"mocha": "^5.2.0",
-		"mocha-steps": "^1.1.0",
+		"mocha": "^8.1.3",
+		"mocha-steps": "^1.3.0",
 		"node-slack-upload": "^1.2.1",
 		"png-itxt": "^1.3.0",
 		"prettier": "npm:wp-prettier@2.1.1-beta-1",
@@ -60,8 +60,8 @@
 		"slack-notify": "^0.1.7",
 		"speakeasy": "^2.0.0",
 		"spec-xunit-reporter": "^0.0.1",
-		"testarmada-magellan": "^11.0.1",
-		"testarmada-magellan-local-executor": "^2.0.0",
+		"testarmada-magellan": "11.0.10",
+		"testarmada-magellan-local-executor": "^2.0.3",
 		"testarmada-magellan-mocha-plugin": "github:Automattic/magellan-mocha-plugin#b731cdf6f27a6fa6e45ddcba0b8741370b2df523",
 		"xml2json-command": "^0.0.3",
 		"xmpp.js": "^0.3.0",

diff --git a/test/e2e/test/mocha.opts b/test/e2e/test/mocha.opts