[bazel] Fix runfiles loading in Bzlmod

SeleniumHQ · Apr 18, 2024 · 853b4df · 853b4df
1 parent 91b6d4e
commit 853b4df
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
@@ -4112,7 +4112,7 @@
     },
     "//dotnet:paket.nuget_extension.bzl%nuget_extension": {
       "general": {
-        "bzlTransitiveDigest": "grtWYvepNL9g78nVYIxVsdB0yN9xi8D7yJauT4wmKik=",
+        "bzlTransitiveDigest": "cUw6jmT9cCbJdO4xf5FiJOraLjX/q1lLN84X4xtwdGE=",
         "recordedFileInputs": {},
         "recordedDirentsInputs": {},
         "envVariables": {},
@@ -60001,7 +60001,7 @@
     },
     "@@rules_dotnet~//dotnet:paket.rules_dotnet_nuget_packages_extension.bzl%rules_dotnet_nuget_packages_extension": {
       "general": {
-        "bzlTransitiveDigest": "pCiI1IdkhrKF1d4VA48vRXFKInLiOukQZpAHG/4jLoc=",
+        "bzlTransitiveDigest": "+qbXxyLh2dDGHnLxcLRHGeGnqxz81aN2gVvqRRSrlTE=",
         "recordedFileInputs": {},
         "recordedDirentsInputs": {},
         "envVariables": {},

diff --git a/dotnet/test/common/Environment/EnvironmentManager.cs b/dotnet/test/common/Environment/EnvironmentManager.cs
@@ -26,7 +26,7 @@ private EnvironmentManager()
             try
             {
                 var runfiles = Runfiles.Create();
-                dataFilePath = runfiles.Rlocation("selenium/dotnet/test/common/appconfig.json");
+                dataFilePath = runfiles.Rlocation("_main/dotnet/test/common/appconfig.json");
             }
             catch (FileNotFoundException)
             {
@@ -135,7 +135,7 @@ private EnvironmentManager()
             }
             else
             {
-                projectRoot += "/selenium";
+                projectRoot += "/_main";
             }
 
             webServer = new TestWebServer(projectRoot, webServerConfig);

diff --git a/dotnet/test/common/Environment/TestWebServer.cs b/dotnet/test/common/Environment/TestWebServer.cs
@@ -13,7 +13,7 @@ public class TestWebServer
     {
         private Process webserverProcess;
 
-        private string standaloneTestJar = @"selenium/java/test/org/openqa/selenium/environment/appserver";
+        private string standaloneTestJar = @"_main/java/test/org/openqa/selenium/environment/appserver";
         private string projectRootPath;
         private bool captureWebServerOutput;
         private bool hideCommandPrompt;

diff --git a/java/test/org/openqa/selenium/testing/drivers/OutOfProcessSeleniumServer.java b/java/test/org/openqa/selenium/testing/drivers/OutOfProcessSeleniumServer.java
@@ -169,9 +169,7 @@ private String buildServerAndClasspath() {
     try {
       Runfiles.Preloaded runfiles = Runfiles.preload();
       String location =
-          runfiles
-              .unmapped()
-              .rlocation("selenium/java/src/org/openqa/selenium/grid/selenium_server");
+          runfiles.unmapped().rlocation("_main/java/src/org/openqa/selenium/grid/selenium_server");
       System.err.println("Location found is: " + location);
       Path path = Paths.get(location);
       if (Files.exists(path)) {