4 files changed, 10 insertions, 19 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/packages/GlobCacheTest.java b/src/test/java/com/google/devtools/build/lib/packages/GlobCacheTest.java
index 5b9beafeaa..78401536cd 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/GlobCacheTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/GlobCacheTest.java
@@ -122,13 +122,12 @@ public class GlobCacheTest {
   }
 
   @Test
-  public void testSafeGlobInvalidPatterns() throws Exception {
-    for (String pattern : new String[] {"Foo?.txt", "List{Test}.py"}) {
-      try {
-        cache.safeGlobUnsorted(pattern, false);
-        fail("Expected pattern " + pattern + " to fail");
-      } catch (BadGlobException expected) {
-      }
+  public void testSafeGlobInvalidPattern() throws Exception {
+    String invalidPattern = "Foo?.txt";
+    try {
+      cache.safeGlobUnsorted(invalidPattern, false);
+      fail("Expected pattern " + invalidPattern + " to fail");
+    } catch (BadGlobException expected) {
     }
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java b/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java
index a7457c74cf..a469bc5b75 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java
@@ -808,16 +808,12 @@ public class PackageFactoryTest extends PackageFactoryTestBase {
   }
 
   @Test
-  public void testBadCharactersInGlob() throws Exception {
-    events.setFailFast(false);
-    assertGlobFails("glob(['{'])", "illegal character");
-    assertGlobFails("glob(['?'])", "illegal character");
+  public void testBadCharacterInGlob() throws Exception {
+   events.setFailFast(false);
+   assertGlobFails("glob(['?'])", "glob pattern '?' contains forbidden '?' wildcard");
   }
 
-  /**
-   * Tests that a glob evaluation that encounters an I/O error produces
-   * a glob error.
-   */
+  /** Tests that a glob evaluation that encounters an I/O error produces a glob error. */
   @Test
   public void testGlobWithIOErrors() throws Exception {
     events.setFailFast(false);
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java
index 27086159d6..8c938ee699 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java
@@ -393,8 +393,6 @@ public abstract class GlobFunctionTest {
 
   @Test
   public void testIllegalPatterns() throws Exception {
-    assertIllegalPattern("[illegal pattern");
-    assertIllegalPattern("}illegal pattern");
     assertIllegalPattern("foo**bar");
     assertIllegalPattern("?");
     assertIllegalPattern("");
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/GlobTest.java b/src/test/java/com/google/devtools/build/lib/vfs/GlobTest.java
index 138ff7a94b..5b0958fae1 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/GlobTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/GlobTest.java
@@ -229,8 +229,6 @@ public class GlobTest {
 
   @Test
   public void testIllegalPatterns() throws Exception {
-    assertIllegalPattern("[illegal pattern");
-    assertIllegalPattern("}illegal pattern");
     assertIllegalPattern("foo**bar");
     assertIllegalPattern("");
     assertIllegalPattern(".");