Add third party tests to the suite, skip azure test if not configured

.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
       - checkout
       - run:
           command: |
-            cd .circleci && ./run-tests.sh "Fast=Fast" && ./can-build.sh
+            cd .circleci && ./run-tests.sh "Fast=Fast|ThirdParty=ThirdParty" && ./can-build.sh
   selenium_tests:
     machine:
         enabled: true
@@ -24,18 +24,6 @@ jobs:
       - run:
           command: |
             cd .circleci && ./run-tests.sh "Integration=Integration"
-  external_tests:
-    machine:
-        enabled: true
-    steps:
-      - checkout
-      - run:
-          command: |
-            if [ "$CIRCLE_PROJECT_USERNAME" == "btcpayserver" ] && [ "$CIRCLE_PROJECT_REPONAME" == "btcpayserver" ]; then
-                cd .circleci && ./run-tests.sh "ExternalIntegration=ExternalIntegration"
-            else
-              echo "Skipping running ExternalIntegration tests outside of context of main user and repository that have access to secrets"
-            fi
   trigger_docs_build:
     machine:
         enabled: true
@@ -127,10 +115,6 @@ workflows:
       - fast_tests
       - selenium_tests
       - integration_tests
-      - external_tests:
-          filters:
-            branches:
-                only: master
   publish:
     jobs:
       - trigger_docs_build:

BTCPayServer.Tests/FactWithSecretAttribute.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Configuration;
+using Xunit;
+using Xunit.Sdk;
+
+namespace BTCPayServer.Tests
+{
+    public class FactWithSecretAttribute : FactAttribute
+    {
+        public FactWithSecretAttribute(string secret)
+        {
+            try
+            {
+                GetFromSecrets(secret);
+            }
+            catch (XunitException ex)
+            {
+                Skip = ex.Message;
+            }
+        }
+        public static string GetFromSecrets(string key)
+        {
+            var connStr = Environment.GetEnvironmentVariable($"TESTS_{key}");
+            if (!string.IsNullOrEmpty(connStr) && connStr != "none")
+                return connStr;
+            var builder = new ConfigurationBuilder();
+            builder.AddUserSecrets("AB0AC1DD-9D26-485B-9416-56A33F268117");
+            var config = builder.Build();
+            var token = config[key];
+            Assert.False(token == null, $"{key} is not set.\n Run \"dotnet user-secrets set {key} <value>\"");
+            return token;
+        }
+    }
+}

BTCPayServer.Tests/ThirdPartyTests.cs

@@ -34,7 +34,7 @@ namespace BTCPayServer.Tests
 
         }
 
-        [Fact(Timeout = TestUtils.TestTimeout)]
+        [FactWithSecret("AzureBlobStorageConnectionString")]
         public async Task CanUseAzureBlobStorage()
         {
             using (var tester = ServerTester.Create())
@@ -47,7 +47,7 @@ namespace BTCPayServer.Tests
                     .IsType<ViewResult>(await controller.StorageProvider(StorageProvider.AzureBlobStorage.ToString()))
                     .Model);
 
-                azureBlobStorageConfiguration.ConnectionString = GetFromSecrets("AzureBlobStorageConnectionString");
+                azureBlobStorageConfiguration.ConnectionString = FactWithSecretAttribute.GetFromSecrets("AzureBlobStorageConnectionString");
                 azureBlobStorageConfiguration.ContainerName = "testscontainer";
                 Assert.IsType<ViewResult>(
                     await controller.EditAzureBlobStorageStorageProvider(azureBlobStorageConfiguration));
@@ -73,19 +73,6 @@ namespace BTCPayServer.Tests
             }
         }
 
-        private static string GetFromSecrets(string key)
-        {
-            var connStr = Environment.GetEnvironmentVariable($"TESTS_{key}");
-            if (!string.IsNullOrEmpty(connStr) && connStr != "none")
-                return connStr;
-            var builder = new ConfigurationBuilder();
-            builder.AddUserSecrets("AB0AC1DD-9D26-485B-9416-56A33F268117");
-            var config = builder.Build();
-            var token = config[key];
-            Assert.False(token == null, $"{key} is not set.\n Run \"dotnet user-secrets set {key} <value>\"");
-            return token;
-        }
-
         [Fact]
         public void CanQueryDirectProviders()
         {

BTCPayServer.Tests/UtilitiesTests.cs

@@ -18,13 +18,13 @@ namespace BTCPayServer.Tests
         /// <summary>
         /// Download transifex transactions and put them in BTCPayServer\wwwroot\locales
         /// </summary>
+        [FactWithSecret("TransifexAPIToken")]
         [Trait("Utilities", "Utilities")]
-        [Fact]
         public async Task PullTransifexTranslations()
         {
             // 1. Generate an API Token on https://www.transifex.com/user/settings/api/
             // 2. Run "dotnet user-secrets set TransifexAPIToken <youapitoken>"
-            var client = new TransifexClient(GetTransifexAPIToken());
+            var client = new TransifexClient(FactWithSecretAttribute.GetFromSecrets("TransifexAPIToken"));
             var json = await client.GetTransifexAsync("https://api.transifex.com/organizations/btcpayserver/projects/btcpayserver/resources/enjson/");
             var langs = new[] { "en" }.Concat(((JObject)json["stats"]).Properties().Select(n => n.Name)).ToArray();
 
@@ -74,16 +74,6 @@ namespace BTCPayServer.Tests
                 File.WriteAllText(Path.Combine(langsDir, langFile), content);
             }).ToArray());
         }
-
-        private static string GetTransifexAPIToken()
-        {
-            var builder = new ConfigurationBuilder();
-            builder.AddUserSecrets("AB0AC1DD-9D26-485B-9416-56A33F268117");
-            var config = builder.Build();
-            var token = config["TransifexAPIToken"];
-            Assert.False(token == null, "TransifexAPIToken is not set.\n 1.Generate an API Token on https://www.transifex.com/user/settings/api/ \n 2.Run \"dotnet user-secrets set TransifexAPIToken <youapitoken>\"");
-            return token;
-        }
     }
 
     public class TransifexClient