commit 518bb872c8b1fc5dbdfc9476715820072252d61a
author janakr <janakr@google.com> Wed Oct 03 15:59:28 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Wed Oct 03 16:01:15 2018 -0700
tree a7243ca23b5e49025d1fadd9058617a84633cbad
parent 8d98d928b90209afb0c6cb38a785520805990fea

Automated rollback of commit b7ec4f22e704b6d9892aa5501012d9f9a54f11c8.

*** Reason for rollback ***

Rolling forward with fix for BazelPackageLoader. (Bug was just that BazelPackageLoader didn't have the correct root, so our sidecar package loading failed.)

PiperOrigin-RevId: 215645324

src/test/java/com/google/devtools/build/lib/packages/EnvironmentGroupTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/packages/EnvironmentGroupTest.java b/src/test/java/com/google/devtools/build/lib/packages/EnvironmentGroupTest.java
index b2e4aec..947723c 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/EnvironmentGroupTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/EnvironmentGroupTest.java
@@ -21,6 +21,7 @@
 import com.google.devtools.build.lib.cmdline.PackageIdentifier;
 import com.google.devtools.build.lib.packages.util.PackageLoadingTestCase;
 import com.google.devtools.build.lib.vfs.Path;
+import com.google.devtools.build.lib.vfs.RootedPath;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -52,7 +53,10 @@
             ")");
     pkg =
         packageFactory.createPackageForTesting(
-            PackageIdentifier.createInMainRepo("pkg"), buildfile, getPackageManager(), reporter);
+            PackageIdentifier.createInMainRepo("pkg"),
+            RootedPath.toRootedPath(root, buildfile),
+            getPackageManager(),
+            reporter);
 
     group = (EnvironmentGroup) pkg.getTarget("group");
   }
@@ -106,8 +110,12 @@
         "a/BUILD",
         "environment_group(name = 'empty_group', environments = [], defaults = [])");
     reporter.removeHandler(failFastHandler);
-    Package emptyGroupPkg = packageFactory.createPackageForTesting(
-        PackageIdentifier.createInMainRepo("a"), buildfile, getPackageManager(), reporter);
+    Package emptyGroupPkg =
+        packageFactory.createPackageForTesting(
+            PackageIdentifier.createInMainRepo("a"),
+            RootedPath.toRootedPath(root, buildfile),
+            getPackageManager(),
+            reporter);
     assertThat(emptyGroupPkg.containsErrors()).isTrue();
     assertContainsEvent(
         "environment group empty_group must contain at least one environment");