Log fixture with diagnostic message propagation

Author: napoly

BTCPayServer.Plugins.IntegrationTests/BTCPayServer.Plugins.IntegrationTests.csproj

@@ -31,9 +31,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <Content Include="Resources\**\*">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </Content>
+        <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
+        <Content Include="Resources\**\*" CopyToOutputDirectory="PreserveNewest" />
     </ItemGroup>
 
     <ItemDefinitionGroup>

BTCPayServer.Plugins.IntegrationTests/Monero/MiningFixture.cs

@@ -18,15 +18,15 @@ public async ValueTask InitializeAsync()
     {
         MoneroWalletConfig config = new();
         config.SetPrimaryAddress(
-            "9yEzCbcYdg6MqZ5AkEh8V3YCriyN1tvmtWEHdBEUHkF6D6kN1MMD2Kd2QVWoTY67aNHNYKMUP3xfteLS2QNavJxpJdx6mWj");
-        config.SetPrivateViewKey("1f4668e8c1979b4c7dae13dc149fd95cd7ff2883becffe160c21f9e02c821c08");
+            "9uZLyeSYy38fKTiWJWyfGp3M7mh5bh8TxWnpfYn2QnAH83V7CwYa8P4HaHXaKXpETG5JuNuq7mdkVSGyx7gfv5arDJCLhpD");
+        config.SetPrivateViewKey("f8917a980fddca4bdcf1b45a6885de6dcd5d86ff86dd102039fed14933a74b0f");
         await CashCowWallet.CreateWallet(config);
         await MineAtLeastToHeight(71);
 
         List<MoneroAccount> moneroAccounts = await CashCowWallet.GetAccounts(true, false, null);
         foreach (MoneroAccount account in moneroAccounts)
         {
-            Console.WriteLine(
+            TestContext.Current.SendDiagnosticMessage(
                 $"Wallet's account with index {account.AccountIndex}: total balance {account.Balance}, unlocked balance {account.UnlockedBalance}");
         }
     }
@@ -45,12 +45,12 @@ private static async Task MineAtLeastToHeight(ulong targetHeight)
         if (miningStatus.IsActive != true)
         {
             await DaemonRpc.StartMining(
-                "9yEzCbcYdg6MqZ5AkEh8V3YCriyN1tvmtWEHdBEUHkF6D6kN1MMD2Kd2QVWoTY67aNHNYKMUP3xfteLS2QNavJxpJdx6mWj",
+                "9uZLyeSYy38fKTiWJWyfGp3M7mh5bh8TxWnpfYn2QnAH83V7CwYa8P4HaHXaKXpETG5JuNuq7mdkVSGyx7gfv5arDJCLhpD",
                 1,
                 false,
                 false
             );
-            Console.WriteLine("Mining started.");
+            TestContext.Current.SendDiagnosticMessage("Mining started.");
         }
 
         ulong lastLoggedHeight = currentHeight;
@@ -65,12 +65,12 @@ await DaemonRpc.StartMining(
             if (height != lastLoggedHeight)
             {
                 lastLoggedHeight = height;
-                Console.WriteLine($"Current height: {height}/{targetHeight}");
+                TestContext.Current.SendDiagnosticMessage($"Current height: {height}/{targetHeight}");
             }
 
             await Task.Delay(1000);
         }
 
-        Console.WriteLine($"Mining to height {targetHeight} completed.");
+        TestContext.Current.SendDiagnosticMessage($"Mining to height {targetHeight} completed.");
     }
 }

BTCPayServer.Plugins.IntegrationTests/Monero/MoneroIntegrationTestBase.cs

@@ -24,12 +24,12 @@ protected MoneroIntegrationTestBase(ITestOutputHelper helper) : base(helper)
 
     public static MoneroDaemonRpc GetDaemonRpc()
     {
-        return new MoneroDaemonRpc(new MoneroRpcConnection(new Uri(Environment.GetEnvironmentVariable("BTCPAY_XMR_DAEMON_URI") ?? "http://node_1:18081"), "", ""));
+        return new MoneroDaemonRpc(new MoneroRpcConnection(new Uri(Environment.GetEnvironmentVariable("BTCPAY_XMR_DAEMON_URI") ?? "http://127.0.0.1:18081"), "", ""));
     }
 
     public static MoneroWalletRpc GetCashCowWalletRpc()
     {
-        return new MoneroWalletRpc(new MoneroRpcConnection(new Uri(Environment.GetEnvironmentVariable("BTCPAY_XMR_CASHCOW_WALLET_DAEMON_URI") ?? "http://xmr_cashcow_wallet:18092"), "", ""));
+        return new MoneroWalletRpc(new MoneroRpcConnection(new Uri(Environment.GetEnvironmentVariable("BTCPAY_XMR_CASHCOW_WALLET_DAEMON_URI") ?? "http://127.0.0.1:18092"), "", ""));
     }
 
     private static void SetDefaultEnv(string key, string defaultValue)

BTCPayServer.Plugins.IntegrationTests/Monero/MoneroPluginIntegrationTest.cs

@@ -72,8 +72,6 @@ await Task.Delay(TimeSpan.FromSeconds(5),
         await s.Page.Locator("#page-primary").ClickAsync();
         await s.Page.FillAsync("#Amount", "4.20");
         await s.Page.FillAsync("#BuyerEmail", "monero@monero.com");
-        await Task.Delay(TimeSpan.FromSeconds(20),
-            TestContext.Current.CancellationToken); // wallet-rpc needs some time to sync. refactor this later
         await s.Page.Locator("#page-primary").ClickAsync();
 
         // View the invoice
@@ -105,7 +103,7 @@ await Task.Delay(TimeSpan.FromSeconds(20),
         var selectedValue = await s.Page.Locator("#AccountIndex").InputValueAsync();
         Assert.Equal("1", selectedValue);
 
-        // Select confirmation time to 0
+        // Select confirmation time to 10
         await s.Page.SelectOptionAsync("#SettlementConfirmationThresholdChoice", "3");
         await s.Page.ClickAsync("#SaveButton");
     }

BTCPayServer.Plugins.IntegrationTests/docker-entrypoint.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-dotnet test -c "${CONFIGURATION_NAME}" --no-build -v n /p:CollectCoverage=true /p:CoverletOutput=/coverage/integration/ /p:CoverletOutputFormat=cobertura /p:Include="[BTCPayServer.Plugins.Monero*]*"
+dotnet test -c "${CONFIGURATION_NAME}" --logger "console;verbosity=detailed" --no-build -v n /p:CollectCoverage=true /p:CoverletOutput=/coverage/integration/ /p:CoverletOutputFormat=cobertura /p:Include="[BTCPayServer.Plugins.Monero*]*"
 
 reportgenerator \
   -reports:"/coverage/unit/coverage.cobertura.xml;/coverage/integration/coverage.cobertura.xml" \

BTCPayServer.Plugins.IntegrationTests/xunit.runner.json

@@ -0,0 +1,4 @@
+{
+  "$schema": "https://xunit.net/schema/current/xunit.runner.schema.json",
+  "diagnosticMessages": true
+}