From 6df6537cf90d8ce10acc27ffca00e0aed5f68558 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Thu, 25 Jul 2019 19:36:03 +0900 Subject: [PATCH] Fix tests, improve logs --- BTCPayServer.Tests/SeleniumTests.cs | 14 +++++++------- BTCPayServer/Services/DynamicDnsSettings.cs | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/BTCPayServer.Tests/SeleniumTests.cs b/BTCPayServer.Tests/SeleniumTests.cs index 7984cb761..c4a7f03dc 100644 --- a/BTCPayServer.Tests/SeleniumTests.cs +++ b/BTCPayServer.Tests/SeleniumTests.cs @@ -106,17 +106,17 @@ namespace BTCPayServer.Tests s.Driver.Navigate().GoToUrl(s.Link("/server/services/dynamic-dns")); s.Driver.AssertNoError(); - if (s.Driver.PageSource.Contains("CanUseDynamicDns.hello.com")) + if (s.Driver.PageSource.Contains("pouet.hello.com")) { // Cleanup old test run - s.Driver.Navigate().GoToUrl(s.Link("/server/services/dynamic-dns/CanUseDynamicDns.hello.com/delete")); + s.Driver.Navigate().GoToUrl(s.Link("/server/services/dynamic-dns/pouet.hello.com/delete")); s.Driver.FindElement(By.Id("continue")).Click(); } s.Driver.FindElement(By.Id("AddDynamicDNS")).Click(); s.Driver.AssertNoError(); // We will just cheat for test purposes by only querying the server s.Driver.FindElement(By.Id("ServiceUrl")).SendKeys(s.Link("/")); - s.Driver.FindElement(By.Id("Settings_Hostname")).SendKeys("CanUseDynamicDns.hello.com"); + s.Driver.FindElement(By.Id("Settings_Hostname")).SendKeys("pouet.hello.com"); s.Driver.FindElement(By.Id("Settings_Login")).SendKeys("MyLog"); s.Driver.FindElement(By.Id("Settings_Password")).SendKeys("MyLog" + Keys.Enter); s.Driver.AssertNoError(); @@ -127,7 +127,7 @@ namespace BTCPayServer.Tests s.Driver.FindElement(By.Id("AddDynamicDNS")).Click(); s.Driver.AssertNoError(); s.Driver.FindElement(By.Id("ServiceUrl")).SendKeys(s.Link("/")); - s.Driver.FindElement(By.Id("Settings_Hostname")).SendKeys("CanUseDynamicDns.hello.com"); + s.Driver.FindElement(By.Id("Settings_Hostname")).SendKeys("pouet.hello.com"); s.Driver.FindElement(By.Id("Settings_Login")).SendKeys("MyLog"); s.Driver.FindElement(By.Id("Settings_Password")).SendKeys("MyLog" + Keys.Enter); s.Driver.AssertNoError(); @@ -135,12 +135,12 @@ namespace BTCPayServer.Tests // Delete it s.Driver.Navigate().GoToUrl(s.Link("/server/services/dynamic-dns")); - Assert.Contains("/server/services/dynamic-dns/CanUseDynamicDns.hello.com/delete", s.Driver.PageSource); - s.Driver.Navigate().GoToUrl(s.Link("/server/services/dynamic-dns/CanUseDynamicDns.hello.com/delete")); + Assert.Contains("/server/services/dynamic-dns/pouet.hello.com/delete", s.Driver.PageSource); + s.Driver.Navigate().GoToUrl(s.Link("/server/services/dynamic-dns/pouet.hello.com/delete")); s.Driver.FindElement(By.Id("continue")).Click(); s.Driver.AssertNoError(); - Assert.DoesNotContain("/server/services/dynamic-dns/CanUseDynamicDns.hello.com/delete", s.Driver.PageSource); + Assert.DoesNotContain("/server/services/dynamic-dns/pouet.hello.com/delete", s.Driver.PageSource); } } diff --git a/BTCPayServer/Services/DynamicDnsSettings.cs b/BTCPayServer/Services/DynamicDnsSettings.cs index 8d14aab4e..b5e2aff9d 100644 --- a/BTCPayServer/Services/DynamicDnsSettings.cs +++ b/BTCPayServer/Services/DynamicDnsSettings.cs @@ -45,12 +45,12 @@ namespace BTCPayServer.Services errorMessage = await result.Content.ReadAsStringAsync(); } catch { } - errorMessage = $"Error: Invalid return code {result.StatusCode}, expected 200 ({errorMessage.Trim()})"; + errorMessage = $"Error: Invalid return code {result.StatusCode}, expected 200 ({errorMessage.Trim()}) for hostname '{Hostname}'"; } } catch (Exception ex) { - errorMessage = $"Error: While querying the Dynamic DNS service ({ex.Message})"; + errorMessage = $"Error: While querying the Dynamic DNS service ({ex.Message}) for hostname '{Hostname}'"; } return errorMessage; }