Switch to alternative approach to handle potential test failures

See https://github.com/Automattic/jetpack/pull/17126/files#r488758175
Automattic · Sep 17, 2020 · d56a0a9 · d56a0a9
1 parent 83fb164
commit d56a0a9
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/packages/blocks/tests/php/test-blocks.php b/packages/blocks/tests/php/test-blocks.php
@@ -67,10 +67,11 @@ public function test_block_classes_invalid_align() {
 	 */
 	public function test_is_amp_request() {
 		add_filter( 'jetpack_is_amp_request', '__return_true' );
-		$is_amp = Blocks::is_amp_request();
-		remove_filter( 'jetpack_is_amp_request', '__return_true' );
-
-		$this->assertTrue( $is_amp );
+		try {
+			$this->assertTrue( Blocks::is_amp_request() );
+		} finally {
+			remove_filter( 'jetpack_is_amp_request', '__return_true' );
+		}
 	}
 
 	/**