Merge pull request #2404 from Priya91/processbug

BugFix: Process tests were accessing Modules when the process hasn't been loaded yet

Author: stephentoub

src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests/ProcessTests.cs

@@ -7,6 +7,7 @@
 using System.IO.Pipes;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Threading;
 using Xunit;
 
 namespace System.Diagnostics.ProcessTests
@@ -190,34 +191,25 @@ public void TestMachineName()
         [Fact]
         public void TestMainModule()
         {
-            // Get MainModule property from a Process object
-            ProcessModule mainModule = _process.MainModule;
-
-            if (!global::Interop.IsOSX) // OS X doesn't currently implement modules support
+            // Module support is not enabled on OSX
+            if (global::Interop.IsOSX)
             {
-                Assert.NotNull(mainModule);
+                Assert.Null(_process.MainModule);
+                Assert.Equal(0, _process.Modules.Count);
+                return;
             }
 
-            if (mainModule != null)
-            {
-                Assert.Equal(CoreRunName, Path.GetFileNameWithoutExtension(mainModule.ModuleName));
+            // Ensure the process has loaded the modules.
+            Assert.True(SpinWait.SpinUntil(() => _process.Modules.Count > 0, WaitInMS));
 
-                // Check that the mainModule is present in the modules list.
-                bool foundMainModule = false;
-                if (_process.Modules != null)
-                {
-                    foreach (ProcessModule pModule in _process.Modules)
-                    {
-                        if (String.Equals(Path.GetFileNameWithoutExtension(pModule.ModuleName), CoreRunName, StringComparison.OrdinalIgnoreCase))
-                        {
-                            foundMainModule = true;
-                            break;
-                        }
-                    }
-
-                    Assert.True(foundMainModule, "Could not found Module " + mainModule.ModuleName);
-                }
-            }
+            // Get MainModule property from a Process object
+            ProcessModule mainModule = _process.MainModule;
+            Assert.NotNull(mainModule);
+            Assert.Equal(CoreRunName, Path.GetFileNameWithoutExtension(mainModule.ModuleName));
+
+            // Check that the mainModule is present in the modules list.
+            IEnumerable<string> processModuleNames = _process.Modules.Cast<ProcessModule>().Select(p => Path.GetFileNameWithoutExtension(p.ModuleName));
+            Assert.Contains(CoreRunName, processModuleNames);
         }
 
         [Fact]
@@ -372,17 +364,17 @@ public void TestProcessorTime()
         [Fact]
         public void TestProcessStartTime()
         {
-            DateTime timeBeforeCreatingProcess = DateTime.UtcNow;
             Process p = CreateProcessInfinite();
             try
             {
                 p.Start();
-                Assert.True(timeBeforeCreatingProcess <= p.StartTime.ToUniversalTime(), "Process StartTime is lesser than previous time.");
+                Assert.True(p.StartTime.ToUniversalTime() <= DateTime.UtcNow, string.Format("Process StartTime is larger than later time."));
             }
             finally
             {
                 if (!p.HasExited)
                     p.Kill();
+
                 Assert.True(p.WaitForExit(WaitInMS));
             }
         }

src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests/project.json

@@ -14,6 +14,7 @@
     "System.Security.SecureString": "4.0.0-beta-*",
     "System.Text.Encoding": "4.0.10-beta-*",
     "System.Text.Encoding.CodePages": "4.0.0-beta-*",
+    "System.Threading": "4.0.10-beta-*",
     "System.Threading.Tasks": "4.0.10-beta-*",
     "System.Threading.Thread": "4.0.0-beta-*",
     "System.Threading.ThreadPool": "4.0.10-beta-*",

src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests/project.lock.json

@@ -413,7 +413,7 @@
           "lib/portable-net45+aspnetcore50+win+wpa81+wp80/xunit.core.dll": {}
         }
       },
-      "xunit.netcore.extensions/1.0.0-prerelease-00056": {
+      "xunit.netcore.extensions/1.0.0-prerelease-00058": {
         "dependencies": {
           "System.Diagnostics.Debug": "4.0.10-beta-22703",
           "System.IO": "4.0.10-beta-22703",
@@ -1207,11 +1207,11 @@
         "lib/portable-net45+aspnetcore50+win+wpa81+wp80/xunit.runner.utility.xml"
       ]
     },
-    "xunit.netcore.extensions/1.0.0-prerelease-00056": {
-      "sha512": "UPxtAjxht7LkVoI6njl23cSXiNtPjM0zT9ouhtS0Ju3bXDSUfWjT3i4vRx8f7xrV24AOdbLfxVETP8DapKHClw==",
+    "xunit.netcore.extensions/1.0.0-prerelease-00058": {
+      "sha512": "RBvpUtoMBeqXYDI+QXt4TIFMBFV3he+KPsTfyAuAiHtqwsrkJoxsA3gF7doOOpKKJ4QKtt7d1YBD3mLusLyveQ==",
       "files": [
-        "xunit.netcore.extensions.1.0.0-prerelease-00056.nupkg",
-        "xunit.netcore.extensions.1.0.0-prerelease-00056.nupkg.sha512",
+        "xunit.netcore.extensions.1.0.0-prerelease-00058.nupkg",
+        "xunit.netcore.extensions.1.0.0-prerelease-00058.nupkg.sha512",
         "xunit.netcore.extensions.nuspec",
         "lib/portable-wpa80+win80+net45+aspnetcore50/Xunit.NetCore.Extensions.dll"
       ]
@@ -1249,6 +1249,7 @@
       "System.Security.SecureString >= 4.0.0-beta-*",
       "System.Text.Encoding >= 4.0.10-beta-*",
       "System.Text.Encoding.CodePages >= 4.0.0-beta-*",
+      "System.Threading >= 4.0.10-beta-*",
       "System.Threading.Tasks >= 4.0.10-beta-*",
       "System.Threading.Thread >= 4.0.0-beta-*",
       "System.Threading.ThreadPool >= 4.0.10-beta-*",