Small improvements in the WPA tests

.github/workflows/test.yml

@@ -12,30 +12,36 @@ on:
       - develop
 
 jobs:
-  wpa:
+  wpa_local:
+    name: WP Acceptance - Local
     runs-on: ubuntu-latest
 
     steps:
     - name: Checkout
       uses: actions/checkout@v2
 
-    - name: Set PHP version
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: '7.2'
-        coverage: none
-        tools: composer:v1
-
     - name: Install dependencies
       run: composer install
 
     - name: Test Local
       run: ./run-wpacceptance.sh -l --attempts=3
 
+  wpa_epio:
+    name: WP Acceptance - ElasticPress.io
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Install dependencies
+      run: composer install
+
     - name: Test EP.io
       run: ./run-wpacceptance.sh --ep-host=${{ secrets.EPIO_HOST }} --es-shield='${{ secrets.EPIO_SHIELD }}' --ep-index-prefix=${{ secrets.EPIO_INDEX_PREFIX }} --attempts=3
 
   phpunit:
+    name: PHP Unit
     runs-on: ubuntu-latest
 
     steps:

tests/wpa/BasicTest.php

@@ -52,15 +52,6 @@ public function testSearch() {
 
 		$I->loginAs( 'wpsnapshots' );
 
-		/**
-		 * While using autosuggest and EP.io, there is a chance we cache a request while
-		 * the index didn't exist yet. Although it doesn't affect any plugin functionality
-		 * it will interfere with this test.
-		 */
-		if ( $this->isElasticPressIo( $I ) ) {
-			$this->runCommand( 'wp transient delete ep_autosuggest_query_request_cache' );
-		}
-
 		$I->moveTo( '/?s=test' );
 
 		$I->click( '#wp-admin-bar-debug-bar' );

tests/wpa/DashboardSyncTest.php

@@ -172,14 +172,14 @@ public function testWpCliSyncDuringDashboardSync() {
 
 		$I->waitUntilElementVisible( '.pause-sync' );
 
-		// Specially when requesting an external server, e.g. EP.io, we
-		// have to wait a bit for the AJAX requests.
-		sleep( 5 );
+		sleep( 1 );
 
 		$I->executeJavaScript( 'document.querySelector( ".pause-sync" ).click();' );
 
 		$I->waitUntilElementVisible( '.resume-sync' );
 
+		// Specially when requesting an external server, e.g. EP.io, we
+		// have to wait a bit for the AJAX requests.
 		sleep( 5 );
 
 		$cli_result = $this->runCommand( 'wp elasticpress index' )['stdout'];

tests/wpa/features/ProtectedContentTest.php

@@ -77,6 +77,9 @@ public function testProtectedContentPostsDraftsList() {
 
 		$this->publishPost( $data, $I );
 
+		// Give some time to the async request that indexes the post.
+		sleep( 5 );
+
 		$I->moveTo( 'wp-admin/edit.php?post_status=draft&post_type=post' );
 
 		$I->click( '#wp-admin-bar-debug-bar' );

tests/wpa/test-mu-plugins/unique-index-name.php

@@ -20,3 +20,5 @@
 function get_docker_cid() {
 	return exec( 'cat /etc/hostname' );
 }
+
+add_filter( 'ep_es_info_cache_expiration', '__return_zero' );