From d1ac6dc7d1b0b6bda44465d2bab12963c9323208 Mon Sep 17 00:00:00 2001 From: LocalizationBuildProcess Date: Mon, 5 Oct 2020 10:58:37 -0700 Subject: [PATCH 1/6] Change Assert.Inconclusive() to Assert.Fail() --- .../Configuration/EnvironmentConfig.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FunctionalTests/Microsoft.Bot.Builder.FunctionalTests/Configuration/EnvironmentConfig.cs b/FunctionalTests/Microsoft.Bot.Builder.FunctionalTests/Configuration/EnvironmentConfig.cs index 1612f08274..f5d66260b2 100644 --- 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; From a9d7d0866f21e65999956cd6a06195a922c67c42 Mon Sep 17 00:00:00 2001 From: LocalizationBuildProcess Date: Mon, 5 Oct 2020 11:01:10 -0700 Subject: [PATCH 2/6] Add #if !AUTOMATEDBUILD --- .../GetTokenRefreshTests.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/FunctionalTests/Microsoft.Bot.Builder.FunctionalTests/GetTokenRefreshTests.cs b/FunctionalTests/Microsoft.Bot.Builder.FunctionalTests/GetTokenRefreshTests.cs index 548b0e3dac..7d63d94c4c 100644 --- 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; From 374cc736d84e963f01bf4629863f73581aaaaf89 Mon Sep 17 00:00:00 2001 From: LocalizationBuildProcess Date: Mon, 5 Oct 2020 13:00:48 -0700 Subject: [PATCH 3/6] Add var TESTAPPID --- build/yaml/botbuilder-dotnet-functional-test-windows.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/yaml/botbuilder-dotnet-functional-test-windows.yml b/build/yaml/botbuilder-dotnet-functional-test-windows.yml index 76f2827b13..5f52c5dc02 100644 --- a/build/yaml/botbuilder-dotnet-functional-test-windows.yml +++ b/build/yaml/botbuilder-dotnet-functional-test-windows.yml @@ -28,7 +28,9 @@ pr: none # no pr trigger variables: AppId: $(WinTestBotAppId) + TESTAPPID: $(WinTestBotAppId) AppSecret: $(WinTestBotAppSecret) + TESTAPPSECRET: $(WinTestBotAppSecret) BotGroup: $(WinTestBotBotGroup) BotName: $(WinTestBotBotName) MSBuildArguments: -p:SignAssembly=false -p:delaySign=false -p:RunAnalyzersDuringBuild=false From a8f47780fe3f31ca3e1a3195cc917a20a294b1a8 Mon Sep 17 00:00:00 2001 From: LocalizationBuildProcess Date: Mon, 5 Oct 2020 13:21:28 -0700 Subject: [PATCH 4/6] Move env vars to dotnet test task --- build/yaml/botbuilder-dotnet-functional-test-windows.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build/yaml/botbuilder-dotnet-functional-test-windows.yml b/build/yaml/botbuilder-dotnet-functional-test-windows.yml index 5f52c5dc02..96ec55d67c 100644 --- a/build/yaml/botbuilder-dotnet-functional-test-windows.yml +++ b/build/yaml/botbuilder-dotnet-functional-test-windows.yml @@ -28,9 +28,7 @@ pr: none # no pr trigger variables: AppId: $(WinTestBotAppId) - TESTAPPID: $(WinTestBotAppId) AppSecret: $(WinTestBotAppSecret) - TESTAPPSECRET: $(WinTestBotAppSecret) BotGroup: $(WinTestBotBotGroup) BotName: $(WinTestBotBotName) MSBuildArguments: -p:SignAssembly=false -p:delaySign=false -p:RunAnalyzersDuringBuild=false @@ -98,6 +96,10 @@ steps: projects: '$(System.DefaultWorkingDirectory)\FunctionalTests\**\*FunctionalTests.csproj' arguments: '-v n --configuration $(BuildConfiguration) --filter "TestCategory=FunctionalTests&TestCategory!=Adapters"' workingDirectory: tests + env: + TestAppId: $(WinTestBotAppId) + TestAppSecret: $(WinTestBotAppSecret) + - task: AzureCLI@1 displayName: 'Delete Resources' From 57d3d8a06039aa1900c94e2f645b9f07cd8a03ea Mon Sep 17 00:00:00 2001 From: LocalizationBuildProcess Date: Mon, 5 Oct 2020 13:25:07 -0700 Subject: [PATCH 5/6] Change env var name to TestPassword --- build/yaml/botbuilder-dotnet-functional-test-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/yaml/botbuilder-dotnet-functional-test-windows.yml b/build/yaml/botbuilder-dotnet-functional-test-windows.yml index 96ec55d67c..b429293d30 100644 --- a/build/yaml/botbuilder-dotnet-functional-test-windows.yml +++ b/build/yaml/botbuilder-dotnet-functional-test-windows.yml @@ -98,7 +98,7 @@ steps: workingDirectory: tests env: TestAppId: $(WinTestBotAppId) - TestAppSecret: $(WinTestBotAppSecret) + TestPassword: $(WinTestBotAppSecret) - task: AzureCLI@1 From ef5c247f856181d796a786f65b21011cb7b41a81 Mon Sep 17 00:00:00 2001 From: LocalizationBuildProcess Date: Mon, 5 Oct 2020 16:25:21 -0700 Subject: [PATCH 6/6] Add TestAppId: $(LinuxTestBotAppId) --- build/yaml/botbuilder-dotnet-functional-test-linux.yml | 3 +++ build/yaml/botbuilder-dotnet-functional-test-windows.yml | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build/yaml/botbuilder-dotnet-functional-test-linux.yml b/build/yaml/botbuilder-dotnet-functional-test-linux.yml index 36e2b1ff02..30df9ff1c7 100644 --- 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 index b429293d30..1776b3bb7d 100644 --- a/build/yaml/botbuilder-dotnet-functional-test-windows.yml +++ b/build/yaml/botbuilder-dotnet-functional-test-windows.yml @@ -99,7 +99,6 @@ steps: env: TestAppId: $(WinTestBotAppId) TestPassword: $(WinTestBotAppSecret) - - task: AzureCLI@1 displayName: 'Delete Resources'