Fix up exception declarations; use EnvironmentalExecException.

--
MOS_MIGRATED_REVID=109404922

1 files changed, 13 insertions, 14 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategyTest.java b/src/test/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategyTest.java
index 94494e32c6..daed53ec3d 100644
--- a/src/test/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategyTest.java
@@ -19,7 +19,6 @@ import static org.junit.Assert.fail;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
-import com.google.devtools.build.lib.actions.UserExecException;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.PathFragment;
@@ -68,12 +67,12 @@ public class LinuxSandboxedStrategyTest extends LinuxSandboxedStrategyTestCase {
    * output of {@code LinuxSandboxedStrategy#fixMounts} for it.
    */
   private ImmutableMap<String, String> userFriendlyMounts(
-      Map<String, String> linksAndFiles, List<String> customMounts) throws IOException {
+      Map<String, String> linksAndFiles, List<String> customMounts) throws Exception {
     return userFriendlyMap(mounts(linksAndFiles, customMounts));
   }
 
   private ImmutableMap<Path, Path> mounts(
-      Map<String, String> linksAndFiles, List<String> customMounts) throws IOException {
+      Map<String, String> linksAndFiles, List<String> customMounts) throws Exception {
     createTreeStructure(linksAndFiles);
 
     ImmutableMap.Builder<Path, Path> mounts = ImmutableMap.builder();
@@ -92,11 +91,11 @@ public class LinuxSandboxedStrategyTest extends LinuxSandboxedStrategyTestCase {
    * the output of {@code LinuxSandboxedStrategy#fixMounts} for it.
    */
   private Map<String, String> userFriendlyMounts(Map<String, String> linksAndFiles)
-      throws IOException {
+      throws Exception {
     return userFriendlyMap(mounts(linksAndFiles));
   }
 
-  private Map<Path, Path> mounts(Map<String, String> linksAndFiles) throws IOException {
+  private Map<Path, Path> mounts(Map<String, String> linksAndFiles) throws Exception {
     return mounts(
         linksAndFiles, ImmutableList.of(Iterables.getFirst(linksAndFiles.keySet(), null)));
   }
@@ -118,7 +117,7 @@ public class LinuxSandboxedStrategyTest extends LinuxSandboxedStrategyTestCase {
     return pathifiedAsserts.build();
   }
 
-  private void createTreeStructure(Map<String, String> linksAndFiles) throws IOException {
+  private void createTreeStructure(Map<String, String> linksAndFiles) throws Exception {
     for (Entry<String, String> entry : linksAndFiles.entrySet()) {
       Path filePath = workspaceDir.getRelative(entry.getKey());
       String linkTarget = entry.getValue();
@@ -136,7 +135,7 @@ public class LinuxSandboxedStrategyTest extends LinuxSandboxedStrategyTestCase {
   }
 
   @Test
-  public void testResolvesRelativeFileToFileSymlinkInSameDir() throws IOException {
+  public void testResolvesRelativeFileToFileSymlinkInSameDir() throws Exception {
     Map<String, String> testFiles = new LinkedHashMap<>();
     testFiles.put("symlink.txt", "goal.txt");
     testFiles.put("goal.txt", "");
@@ -149,7 +148,7 @@ public class LinuxSandboxedStrategyTest extends LinuxSandboxedStrategyTestCase {
   }
 
   @Test
-  public void testResolvesRelativeFileToFileSymlinkInSubDir() throws IOException {
+  public void testResolvesRelativeFileToFileSymlinkInSubDir() throws Exception {
     Map<String, String> testFiles =
         ImmutableMap.of(
             "symlink.txt", "x/goal.txt",
@@ -160,7 +159,7 @@ public class LinuxSandboxedStrategyTest extends LinuxSandboxedStrategyTestCase {
   }
 
   @Test
-  public void testResolvesRelativeFileToFileSymlinkInParentDir() throws IOException {
+  public void testResolvesRelativeFileToFileSymlinkInParentDir() throws Exception {
     Map<String, String> testFiles =
         ImmutableMap.of(
             "x/symlink.txt", "../goal.txt",
@@ -172,7 +171,7 @@ public class LinuxSandboxedStrategyTest extends LinuxSandboxedStrategyTestCase {
   }
 
   @Test
-  public void testRecursesSubDirs() throws IOException {
+  public void testRecursesSubDirs() throws Exception {
     ImmutableList<String> inputFile = ImmutableList.of("a/b");
 
     Map<String, String> testFiles =
@@ -191,7 +190,7 @@ public class LinuxSandboxedStrategyTest extends LinuxSandboxedStrategyTestCase {
    * Test that the algorithm correctly identifies and refuses symlink loops.
    */
   @Test
-  public void testCatchesSymlinkLoop() throws IOException {
+  public void testCatchesSymlinkLoop() throws Exception {
     try {
       mounts(
           ImmutableMap.of(
@@ -212,7 +211,7 @@ public class LinuxSandboxedStrategyTest extends LinuxSandboxedStrategyTestCase {
    * directories (e.g. "a -> dir/file/file").
    */
   @Test
-  public void testCatchesIllegalSymlink() throws IOException {
+  public void testCatchesIllegalSymlink() throws Exception {
     try {
       mounts(
           ImmutableMap.of(
@@ -228,7 +227,7 @@ public class LinuxSandboxedStrategyTest extends LinuxSandboxedStrategyTestCase {
   }
 
   @Test
-  public void testParseManifestFile() throws IOException, UserExecException {
+  public void testParseManifestFile() throws Exception {
     Path targetDir = workspaceDir.getRelative("runfiles");
     targetDir.createDirectory();
 
@@ -255,7 +254,7 @@ public class LinuxSandboxedStrategyTest extends LinuxSandboxedStrategyTestCase {
   }
 
   @Test
-  public void testParseFilesetManifestFile() throws IOException, UserExecException {
+  public void testParseFilesetManifestFile() throws Exception {
     Path targetDir = workspaceDir.getRelative("fileset");
     targetDir.createDirectory();