1 files changed, 9 insertions, 1 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTest.java b/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTest.java
index de9b48e825..c964539e7a 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTest.java
@@ -129,7 +129,6 @@ public class WorkspaceFactoryTest {
         "    repo_mapping = {'@x' : '@y'},",
         ")");
     assertMapping(helper, "@foo", "@x", "@y");
-    assertMapping(helper, "@foo", "@bar", "@");
   }
   
   @Test
@@ -200,11 +199,20 @@ public class WorkspaceFactoryTest {
 
   @Test
   public void testImplicitMainRepoRename() throws Exception {
+    helper.setSkylarkSemantics("--experimental_remap_main_repo");
     helper.parse("workspace(name = 'foo')");
     assertMapping(helper, "@", "@foo", "@");
   }
 
   @Test
+  public void testNoImplicitMainRepoRenameWithoutFlag() throws Exception {
+    helper.parse("workspace(name = 'foo')");
+    RepositoryName foo = RepositoryName.create("@foo");
+    assertThat(helper.getPackage().getRepositoryMapping("@"))
+        .doesNotContainEntry(foo, RepositoryName.MAIN);
+  }
+
+  @Test
   public void testEmptyRepositoryHasEmptyMap() throws Exception {
     helper.parse("");
     assertThat(helper.getPackage().getRepositoryMapping("@")).isEmpty();