Merge pull request #7999 from ampproject/fix/test_add_block_source_comments

Fix test_add_block_source_comments after Gutenberg 20.5

Author: westonruter

tests/php/validation/test-class-amp-validation-manager.php

@@ -1429,6 +1429,7 @@ public function test_add_block_source_comments( $content, $expected, $query ) {
 
 		// Remove unique layout ID.
 		$rendered_block = preg_replace( '/\s*(?<= class=")?has-\d+-columns-columns-layout-\d+\s*/', ' has-2-columns', $rendered_block );
+		$rendered_block = preg_replace( '/\s*(?<= class=")?has-\d+-columns-columns-is-layout-[0-9a-f]+\s*/', ' has-2-columns', $rendered_block );
 
 		// Remove layout class name and ID.
 		$rendered_block = str_replace(