Merge pull request #2513 from Priya91/pbugfix

BugFix: Attempt fix for process tests failing in CI environment.

Author: Priya91

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

@@ -6,6 +6,7 @@
 using System.IO;
 using Xunit;
 using System.Threading;
+using System.ComponentModel;
 
 namespace System.Diagnostics.ProcessTests
 {
@@ -14,30 +15,17 @@ public class ProcessModuleTests : ProcessTestBase
         [Fact, PlatformSpecific(~PlatformID.OSX)]
         public void TestModulePropertiesExceptOnOSX()
         {
-            string fileName = CoreRunName;
-            if (global::Interop.IsWindows)
-                fileName = string.Format("{0}.exe", CoreRunName);
-
-            // Ensure the process has loaded the modules.
-            Assert.True(SpinWait.SpinUntil(() =>
-            {
-                if (_process.Modules.Count > 0)
-                    return true;
-                _process.Refresh();
-                return false;
-            }, WaitInMS));
-
-            ProcessModuleCollection moduleCollection = _process.Modules;
+            ProcessModuleCollection moduleCollection = Process.GetCurrentProcess().Modules;
             Assert.True(moduleCollection.Count > 0);
 
-            ProcessModule coreRunModule = _process.MainModule;
-            Assert.True(coreRunModule.BaseAddress.ToInt64() > 0);
-            Assert.True(coreRunModule.EntryPointAddress.ToInt64() >= 0);
-            Assert.Equal(fileName, coreRunModule.ModuleName);
-            Assert.True(coreRunModule.ModuleMemorySize > 0);
-            Assert.EndsWith(fileName, coreRunModule.FileName);
-
-            Assert.Equal(string.Format("System.Diagnostics.ProcessModule ({0})", fileName), coreRunModule.ToString());
+            for (int i = 0; i < moduleCollection.Count; i++)
+            {
+                Assert.True(moduleCollection[i].BaseAddress.ToInt64() > 0);
+                // From MSDN: Due to changes in the way that Windows loads assemblies, 
+                // EntryPointAddress will always return 0 on Windows 8 or Windows 8.1 and should not be relied on for those platforms.
+                Assert.True(moduleCollection[i].EntryPointAddress.ToInt64() >= 0);
+                Assert.True(moduleCollection[i].ModuleMemorySize > 0);
+            }
         }
 
         [Fact, PlatformSpecific(PlatformID.OSX)]

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

@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -185,35 +186,18 @@ public void TestMachineName()
             Assert.NotNull(_process.MachineName);
         }
 
-        [ActiveIssue(1896)]
-        [Fact]
-        public void TestMainModule()
+        [Fact, PlatformSpecific(~PlatformID.OSX)]
+        public void TestMainModuleOnNonOSX()
         {
-            // Module support is not enabled on OSX
-            if (global::Interop.IsOSX)
-            {
-                Assert.Null(_process.MainModule);
-                Assert.Equal(0, _process.Modules.Count);
-                return;
-            }
-
-            // Ensure the process has loaded the modules.
-            Assert.True(SpinWait.SpinUntil(() =>
-            {
-                if (_process.Modules.Count > 0)
-                    return true;
-                _process.Refresh();
-                return false;
-            }, WaitInMS));
-
-            // Get MainModule property from a Process object
-            ProcessModule mainModule = _process.MainModule;
-            Assert.NotNull(mainModule);
-            Assert.Equal(CoreRunName, Path.GetFileNameWithoutExtension(mainModule.ModuleName));
+            string fileName = "corerun";
+            if (global::Interop.IsWindows)
+                fileName = "CoreRun.exe";
 
-            // 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);
+            Process p = Process.GetCurrentProcess();
+            Assert.True(p.Modules.Count > 0);
+            Assert.Equal(fileName, p.MainModule.ModuleName);
+            Assert.EndsWith(fileName, p.MainModule.FileName);
+            Assert.Equal(string.Format("System.Diagnostics.ProcessModule ({0})", fileName), p.MainModule.ToString());
         }
 
         [Fact]
@@ -377,7 +361,6 @@ public void TestProcessorTime()
             Assert.InRange(processorTimeAtHalfSpin, processorTimeBeforeSpin, Process.GetCurrentProcess().TotalProcessorTime.TotalSeconds);
         }
 
-        [ActiveIssue(2474)]
         [Fact]
         public void TestProcessStartTime()
         {
@@ -391,8 +374,10 @@ public void TestProcessStartTime()
                 // Thus, because there are HZ timer interrupts in a second, there are HZ jiffies in a second. Hence 1\HZ, will
                 // be the resolution of system timer. The lowest value of HZ on unix is 100, hence the timer resolution is 10 ms.
                 // Allowing for error in 10 ms.
-                long beforeTicks = timeBeforeCreatingProcess.Ticks - new TimeSpan(0, 0, 0, 0, 10).Ticks;
-                Assert.InRange(p.StartTime.ToUniversalTime().Ticks, beforeTicks, DateTime.UtcNow.Ticks);
+                long tenMSTicks = new TimeSpan(0, 0, 0, 0, 10).Ticks;
+                long beforeTicks = timeBeforeCreatingProcess.Ticks - tenMSTicks;
+                long afterTicks = DateTime.UtcNow.Ticks + tenMSTicks;
+                Assert.InRange(p.StartTime.ToUniversalTime().Ticks, beforeTicks, afterTicks);
             }
             finally
             {

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

@@ -79,8 +79,10 @@ public void TestStartTimeProperty()
                     // Thus, because there are HZ timer interrupts in a second, there are HZ jiffies in a second. Hence 1\HZ, will
                     // be the resolution of system timer. The lowest value of HZ on unix is 100, hence the timer resolution is 10 ms.
                     // Allowing for error in 10 ms.
-                    long beforeTicks = timeBeforeCreatingProcess.Ticks - new TimeSpan(0, 0, 0, 0, 10).Ticks;
-                    Assert.InRange(thread.StartTime.ToUniversalTime().Ticks, beforeTicks, DateTime.UtcNow.Ticks);
+                    long tenMSTicks = new TimeSpan(0, 0, 0, 0, 10).Ticks;
+                    long beforeTicks = timeBeforeCreatingProcess.Ticks - tenMSTicks;
+                    long afterTicks = DateTime.UtcNow.Ticks + tenMSTicks;
+                    Assert.InRange(thread.StartTime.ToUniversalTime().Ticks, beforeTicks, afterTicks);
                 }
             }
             finally