From d3b1465444d8b58d6532c4ddcf817e5ac3a0acde Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 2 Mar 2020 00:07:02 +0000 Subject: [PATCH] mantis 8667: remove wildcards from a very limited test of a very limited thing --- OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 2 +- OpenSim/Tests/ConfigurationLoaderTest.cs | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 780e7c8096..4303769b66 100755 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs @@ -8502,7 +8502,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP catch (Exception e) { m_log.ErrorFormat( - "[LLCLIENTVIEW]: Exeception when handling generic message {0}{1}", e.Message, e.StackTrace); + "[LLCLIENTVIEW]: Exception when handling generic message {0}{1}", e.Message, e.StackTrace); } } } diff --git a/OpenSim/Tests/ConfigurationLoaderTest.cs b/OpenSim/Tests/ConfigurationLoaderTest.cs index 2a67b84438..a14f1672c8 100644 --- a/OpenSim/Tests/ConfigurationLoaderTest.cs +++ b/OpenSim/Tests/ConfigurationLoaderTest.cs @@ -81,8 +81,12 @@ namespace OpenSim.Tests ini = new IniConfigSource(); config = ini.AddConfig("IncludeTest"); - config.Set("Include-absolute", "absolute/*/config/*.ini"); - config.Set("Include-relative", "../" + m_testSubdirectory + "/relative/*/config/*.ini"); + config.Set("Include-absolute", "absolute/one/config/setting.ini"); + config.Set("Include-absolute1", "absolute/two/config/setting1.ini"); + config.Set("Include-absolute2", "absolute/two/config/setting2.ini"); + config.Set("Include-relative", "../" + m_testSubdirectory + "/relative/one/config/setting.ini"); + config.Set("Include-relative1", "../" + m_testSubdirectory + "/relative/two/config/setting1.ini"); + config.Set("Include-relative2", "../" + m_testSubdirectory + "/relative/two/config/setting2.ini"); CreateIni(mainIniFile, ini); ini = new IniConfigSource(); @@ -130,9 +134,6 @@ namespace OpenSim.Tests // Finally, we are able to check the result Assert.AreEqual(m_config.ToString(), source.Source.ToString(), "Configuration with includes does not contain all settings."); - // The following would be preferable but fails due to a type mismatch which I am not able to resolve - //CollectionAssert.AreEquivalent(m_config.Configs, source.Source.Configs, - // String.Format("Configuration with includes does not contain all settings.\nAll settings:\n{0}\nSettings read:\n{1}", m_config, source.Source)); } private void CreateIni(string filepath, IniConfigSource source)