OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mantis 8667: remove wildcards from a very limited test of a very limited thing

master
UbitUmarov 2020-03-02 00:07:02 +00:00
parent cf948d56a1
commit d3b1465444
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -8502,7 +8502,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
catch (Exception e) catch (Exception e)
{ {
m_log.ErrorFormat( 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);
} }
} }
} }

11
OpenSim/Tests/ConfigurationLoaderTest.cs
View File

@ -81,8 +81,12 @@ namespace OpenSim.Tests
ini = new IniConfigSource(); ini = new IniConfigSource();
config = ini.AddConfig("IncludeTest"); config = ini.AddConfig("IncludeTest");
config.Set("Include-absolute", "absolute/*/config/*.ini"); config.Set("Include-absolute", "absolute/one/config/setting.ini");
config.Set("Include-relative", "../" + m_testSubdirectory + "/relative/*/config/*.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); CreateIni(mainIniFile, ini);
ini = new IniConfigSource(); ini = new IniConfigSource();
@ -130,9 +134,6 @@ namespace OpenSim.Tests
// Finally, we are able to check the result // Finally, we are able to check the result
Assert.AreEqual(m_config.ToString(), source.Source.ToString(), Assert.AreEqual(m_config.ToString(), source.Source.ToString(),
"Configuration with includes does not contain all settings."); "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) private void CreateIni(string filepath, IniConfigSource source)