Change Assert.Inconclusive() to Assert.Fail() in tests (#4754)

* Change Assert.Inconclusive() to Assert.Fail() * Add #if !AUTOMATEDBUILD * Add var TESTAPPID * Move env vars to dotnet test task * Change env var name to TestPassword * Add TestAppId: $(LinuxTestBotAppId)
microsoft · Oct 6, 2020 · 540fadc · 540fadc
1 parent 7fa5024
commit 540fadc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/FunctionalTests/Microsoft.Bot.Builder.FunctionalTests/Configuration/EnvironmentConfig.cs b/FunctionalTests/Microsoft.Bot.Builder.FunctionalTests/Configuration/EnvironmentConfig.cs
@@ -15,7 +15,7 @@ public static string TestAppId()
             var testAppId = Environment.GetEnvironmentVariable("TESTAPPID");
             if (string.IsNullOrWhiteSpace(testAppId))
             {
-                Assert.Inconclusive("Environment variable 'TestAppId' not found.");
+                Assert.Fail("Environment variable 'TestAppId' not found.");
             }
 
             return testAppId;
@@ -27,7 +27,7 @@ public static string TestAppPassword()
 
             if (string.IsNullOrWhiteSpace(testPassword))
             {
-                Assert.Inconclusive("Environment variable 'TestPassword' not found.");
+                Assert.Fail("Environment variable 'TestPassword' not found.");
             }
 
             return testPassword;

diff --git a/FunctionalTests/Microsoft.Bot.Builder.FunctionalTests/GetTokenRefreshTests.cs b/FunctionalTests/Microsoft.Bot.Builder.FunctionalTests/GetTokenRefreshTests.cs
@@ -12,6 +12,9 @@ namespace Microsoft.Bot.Builder.FunctionalTests
 {
     [TestClass]
     [TestCategory("FunctionalTests")]
+#if !AUTOMATEDBUILD
+    [Ignore]
+#endif
     public class GetTokenRefreshTests
     {
         private string testAppId = null;

diff --git a/build/yaml/botbuilder-dotnet-functional-test-linux.yml b/build/yaml/botbuilder-dotnet-functional-test-linux.yml
@@ -99,6 +99,9 @@ steps:
     projects: '$(System.DefaultWorkingDirectory)\FunctionalTests\**\*FunctionalTests.csproj'
     arguments: '-v n --configuration $(BuildConfiguration) --filter "TestCategory=FunctionalTests&TestCategory!=Adapters" --collect:"Code Coverage" --settings $(System.DefaultWorkingDirectory)\CodeCoverage.runsettings '
     workingDirectory: '$(System.DefaultWorkingDirectory)\'
+  env:
+    TestAppId: $(LinuxTestBotAppId)
+    TestPassword: $(LinuxTestBotAppSecret)
 
 - task: AzureCLI@1
   displayName: 'Delete test resource group'

diff --git a/build/yaml/botbuilder-dotnet-functional-test-windows.yml b/build/yaml/botbuilder-dotnet-functional-test-windows.yml
@@ -96,6 +96,9 @@ steps:
     projects: '$(System.DefaultWorkingDirectory)\FunctionalTests\**\*FunctionalTests.csproj'
     arguments: '-v n --configuration $(BuildConfiguration) --filter "TestCategory=FunctionalTests&TestCategory!=Adapters"'
     workingDirectory: tests
+  env:
+    TestAppId: $(WinTestBotAppId)
+    TestPassword: $(WinTestBotAppSecret)
 
 - task: AzureCLI@1
   displayName: 'Delete Resources'