Updating internal .NET test infrastructure to allow passing in suppor…

…t paths
SeleniumHQ · May 3, 2019 · 913cce4 · 913cce4
1 parent f42c3cb
commit 913cce4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/dotnet/test/common/Environment/EnvironmentManager.cs b/dotnet/test/common/Environment/EnvironmentManager.cs
@@ -45,21 +45,27 @@ private EnvironmentManager()
 
             urlBuilder = new UrlBuilder(websiteConfig);
 
-            DirectoryInfo info = new DirectoryInfo(currentDirectory);
-            while (info != info.Root && string.Compare(info.Name, "bazel-out", StringComparison.OrdinalIgnoreCase) != 0 && string.Compare(info.Name, "buck-out", StringComparison.OrdinalIgnoreCase) != 0 && string.Compare(info.Name, "build", StringComparison.OrdinalIgnoreCase) != 0)
+            string projectRoot = TestContext.Parameters.Get("RootPath", string.Empty);
+            if (string.IsNullOrEmpty(projectRoot))
             {
+                DirectoryInfo info = new DirectoryInfo(currentDirectory);
+                while (info != info.Root && string.Compare(info.Name, "bazel-out", StringComparison.OrdinalIgnoreCase) != 0 && string.Compare(info.Name, "buck-out", StringComparison.OrdinalIgnoreCase) != 0 && string.Compare(info.Name, "build", StringComparison.OrdinalIgnoreCase) != 0)
+                {
+                    info = info.Parent;
+                }
+
                 info = info.Parent;
+                projectRoot = info.FullName;
             }
 
-            info = info.Parent;
-            webServer = new TestWebServer(info.FullName);
+            webServer = new TestWebServer(projectRoot);
             bool autoStartRemoteServer = false;
             if (browser == Browser.Remote)
             {
                 autoStartRemoteServer = driverConfig.AutoStartRemoteServer;
             }
 
-            remoteServer = new RemoteSeleniumServer(info.FullName, autoStartRemoteServer);
+            remoteServer = new RemoteSeleniumServer(projectRoot, autoStartRemoteServer);
         }
 
         ~EnvironmentManager()

diff --git a/dotnet/test/common/Environment/TestWebServer.cs b/dotnet/test/common/Environment/TestWebServer.cs
@@ -39,9 +39,11 @@ public void Start()
                     javaExecutableName = javaExecutableName + ".exe";
                 }
 
+                string processArgs = string.Format("-Duser.dir={0} -cp {1} {2}", projectRootPath, standaloneTestJar, webserverClassName);
+
                 webserverProcess = new Process();
                 webserverProcess.StartInfo.FileName = javaExecutableName;
-                webserverProcess.StartInfo.Arguments = "-cp " + standaloneTestJar + " " + webserverClassName;
+                webserverProcess.StartInfo.Arguments = processArgs;
                 webserverProcess.StartInfo.WorkingDirectory = projectRootPath;
                 webserverProcess.Start();
                 DateTime timeout = DateTime.Now.Add(TimeSpan.FromSeconds(30));