Disable an uitest on GitHub Action.

whistyun · Nov 5, 2022 · 04a2abe · 04a2abe
1 parent 1eff271
commit 04a2abe
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -42,3 +42,5 @@ jobs:
       run: dotnet build --no-restore
     - name: Test
       run: dotnet test --no-build --verbosity normal 
+      env:
+        RUNON_GITHUB: yes
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -9,4 +9,8 @@
     <BaseOutputPath>$(ArtifactsDir)bin\$(MSBuildProjectName)\</BaseOutputPath>
     <PackageOutputPath>$(ArtifactsDir)nuget\$(Configuration)\</PackageOutputPath>
   </PropertyGroup>
+
+  <PropertyGroup>
+    <PackageVersion>1.16.2</PackageVersion>
+  </PropertyGroup>
 </Project>
diff --git a/MdXaml.Html/MdXaml.Html.csproj b/MdXaml.Html/MdXaml.Html.csproj
@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<TargetFrameworks>netcoreapp3.0;net45;net5.0-windows</TargetFrameworks>
     <PackageId>MdXaml.Html</PackageId>
-    <Version>1.16.1</Version>
+    <Version>$(PackageVersion)</Version>
     <Authors>whistyun</Authors>
     <Company />
     <Description>Markdown XAML processor</Description>

diff --git a/MdXaml.Plugins/MdXaml.Plugins.csproj b/MdXaml.Plugins/MdXaml.Plugins.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.0;net45;net5.0-windows</TargetFrameworks>
     <PackageId>MdXaml.Plugins</PackageId>
-    <Version>1.16.1</Version>
+    <Version>$(PackageVersion)</Version>
     <Authors>whistyun</Authors>
     <Company />
     <Description>Markdown XAML processor</Description>

diff --git a/MdXaml.Svg/MdXaml.Svg.csproj b/MdXaml.Svg/MdXaml.Svg.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.0;net45;net5.0-windows</TargetFrameworks>
     <PackageId>MdXaml.Svg</PackageId>
-    <Version>1.16.1</Version>
+    <Version>$(PackageVersion)</Version>
     <Authors>whistyun</Authors>
     <Company />
     <Description>Markdown XAML processor</Description>

diff --git a/MdXaml/MdXaml.csproj b/MdXaml/MdXaml.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>netcoreapp3.0;net45;net5.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <PackageId>MdXaml</PackageId>
-    <Version>1.16.1</Version>
+    <Version>$(PackageVersion)</Version>
     <Authors>Bevan Arps(original); whistyun</Authors>
     <Company />
     <Description>Markdown XAML processor</Description>

diff --git a/MdXaml/MdXamlMigfree.csproj b/MdXaml/MdXamlMigfree.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>netcoreapp3.0;net45;net5.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <PackageId>MdXaml_migfree</PackageId>
-    <Version>1.16.1</Version>
+    <Version>$(PackageVersion)</Version>
     <Authors>Bevan Arps(original); whistyun</Authors>
     <Company />
     <Description>Markdown XAML processor</Description>

diff --git a/tests/VisualTest/Class1.cs b/tests/VisualTest/Class1.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+#if !OnGitHubAction
+using NUnit.Framework;
 using System;
 using System.Diagnostics;
 using System.Drawing.Text;
@@ -34,16 +35,21 @@ public Class1()
             _exeFilePath = Path.Combine(_projectDirectory.Replace("VisualTest", "VisualTestApp"), relPath, "VisualTestApp.exe");
         }
 
-
         [SetUp]
         public void Setup()
         {
             _process = Process.Start(_exeFilePath);
 
+            var stopwatch = new Stopwatch();
+            stopwatch.Start();
+
             while (_hwnd == IntPtr.Zero)
             {
                 Thread.Sleep(1000);
                 _hwnd = _process.MainWindowHandle;
+
+                if (stopwatch.ElapsedMilliseconds > 5000)
+                    throw new InvalidOperationException("Application startup timeout");
             }
         }
 
@@ -60,10 +66,16 @@ public void CheckFileRemove()
             markdownValPtn.SetValue("Markdown.txt");
 
             // wait for viewing markdown
+            var stopwatch = new Stopwatch();
+            stopwatch.Start();
+
             var markdownView = mainWindow.FindPatternById<TextPattern>("MarkdownScrollViewer");
             while (markdownView.DocumentRange.GetChildren().Length < 4)
             {
                 Thread.Sleep(1000);
+
+                if (stopwatch.ElapsedMilliseconds > 5000)
+                    throw new InvalidOperationException("Markdown drawing timeout");
             }
 
             Thread.Sleep(1000);
@@ -112,3 +124,4 @@ public void Closing()
         }
     }
 }
+#endif
diff --git a/tests/VisualTest/VisualTest.csproj b/tests/VisualTest/VisualTest.csproj
@@ -25,5 +25,8 @@
     </None>
   </ItemGroup>
 
+  <PropertyGroup Condition=" '$(RUNON_GITHUB)' != '' ">
+    <DefineConstants>OnGitHubAction</DefineConstants>
+  </PropertyGroup>
 
 </Project>