commit 3674131d69d46ef6de95ca640033380947b44d19
author michajlo <michajlo@google.com> Wed Mar 04 16:06:50 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Mar 04 16:08:48 2020 -0800
tree 2bc3671e96d81dff7b3e275d9cbdba52b1657414
parent bdae1c28ebc4473e7c83ff4c779c8eab34a8b51e

Improve detail of TargetPatternSupport failures

Some post-review comments/observations.

RELNOTES: None
PiperOrigin-RevId: 298964639

src/main/java/com/google/devtools/build/lib/runtime/commands/TargetPatternsHelper.java

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/TargetPatternsHelper.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/TargetPatternsHelper.java
index 56781e5..ad64af3 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/TargetPatternsHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/TargetPatternsHelper.java
@@ -18,7 +18,6 @@
 import com.google.devtools.build.lib.buildtool.BuildRequestOptions;
 import com.google.devtools.build.lib.profiler.Profiler;
 import com.google.devtools.build.lib.profiler.SilentCloseable;
-import com.google.devtools.build.lib.runtime.BlazeCommand;
 import com.google.devtools.build.lib.runtime.CommandEnvironment;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
 import com.google.devtools.build.lib.vfs.Path;
@@ -27,9 +26,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 
-/**
- * Provides support for implementations for {@link BlazeCommand} to read target patterns from file.
- */
+/** Provides support for reading target patterns from a file or the command-line. */
 final class TargetPatternsHelper {
 
   private TargetPatternsHelper() {}
@@ -55,7 +52,7 @@
             Lists.newArrayList(FileSystemUtils.readLines(residuePath, StandardCharsets.UTF_8));
       } catch (IOException e) {
         throw new TargetPatternsHelperException(
-            "I/O error reading from " + residuePath.getPathString());
+            "I/O error reading from " + residuePath.getPathString() + ": " + e.getMessage());
       }
     } else {
       try (SilentCloseable closeable =

src/test/java/com/google/devtools/build/lib/runtime/commands/TargetPatternsHelperTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/runtime/commands/TargetPatternsHelperTest.java b/src/test/java/com/google/devtools/build/lib/runtime/commands/TargetPatternsHelperTest.java
index 2c9680a..6a780cb 100644
--- a/src/test/java/com/google/devtools/build/lib/runtime/commands/TargetPatternsHelperTest.java
+++ b/src/test/java/com/google/devtools/build/lib/runtime/commands/TargetPatternsHelperTest.java
@@ -92,15 +92,26 @@
     options.parse("--target_pattern_file=patterns.txt");
     options.setResidue(ImmutableList.of("//some:pattern"));
 
-    assertThrows(
-        TargetPatternsHelperException.class, () -> TargetPatternsHelper.readFrom(env, options));
+    TargetPatternsHelperException expected =
+        assertThrows(
+            TargetPatternsHelperException.class, () -> TargetPatternsHelper.readFrom(env, options));
+
+    assertThat(expected)
+        .hasMessageThat()
+        .isEqualTo(
+            "Command-line target pattern and --target_pattern_file cannot both be specified");
   }
 
   @Test
   public void testSpecifyNonExistingFileThrows() throws OptionsParsingException {
     options.parse("--target_pattern_file=patterns.txt");
 
-    assertThrows(
-        TargetPatternsHelperException.class, () -> TargetPatternsHelper.readFrom(env, options));
+    TargetPatternsHelperException expected =
+        assertThrows(
+            TargetPatternsHelperException.class, () -> TargetPatternsHelper.readFrom(env, options));
+
+    assertThat(expected)
+        .hasMessageThat()
+        .matches("I/O error reading from .*patterns.txt.*\\(No such file or directory\\)");
   }
 }