Merge branch 'master' into httptests

This commit is contained in:
UbitUmarov
2016-12-23 02:53:58 +00:00
13 changed files with 600 additions and 197 deletions

View File

@@ -70,7 +70,6 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
IConfigSource config = new IniConfigSource();
config.AddConfig("Startup");
config.Configs["Startup"].Set("EventQueue", "true");
CapabilitiesModule capsModule = new CapabilitiesModule();
m_eqgMod = new EventQueueGetModule();
@@ -195,4 +194,4 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
Assert.That((int)eventsResponse["int_response_code"], Is.EqualTo((int)HttpStatusCode.BadGateway));
}
}
}
}