diff options
author | Justin Clark-Casey (justincc) | 2012-09-19 01:06:42 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-09-19 01:06:42 +0100 |
commit | 967d42d393a48841dd0f6e4e1173f77cfaa3c5e6 (patch) | |
tree | 38ef29743b6f07ff8c89fb3bd246837e1fb93697 /OpenSim/Region/CoreModules/ServiceConnectorsOut | |
parent | Downgrade libopenjpeg back to 1.3 from 1.5. (diff) | |
download | opensim-SC_OLD-967d42d393a48841dd0f6e4e1173f77cfaa3c5e6.zip opensim-SC_OLD-967d42d393a48841dd0f6e4e1173f77cfaa3c5e6.tar.gz opensim-SC_OLD-967d42d393a48841dd0f6e4e1173f77cfaa3c5e6.tar.bz2 opensim-SC_OLD-967d42d393a48841dd0f6e4e1173f77cfaa3c5e6.tar.xz |
Correctly override and call base OpenSimTestCase.SetUp() method in GridConnectorsTests and ArchiverTests.
Remove unrelated compile warning from AttachmentsModuleTests.
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs index 57ae549..4338133 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs | |||
@@ -46,8 +46,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests | |||
46 | public class GridConnectorsTests : OpenSimTestCase | 46 | public class GridConnectorsTests : OpenSimTestCase |
47 | { | 47 | { |
48 | LocalGridServicesConnector m_LocalConnector; | 48 | LocalGridServicesConnector m_LocalConnector; |
49 | private void SetUp() | 49 | |
50 | [SetUp] | ||
51 | public override void SetUp() | ||
50 | { | 52 | { |
53 | base.SetUp(); | ||
54 | |||
51 | IConfigSource config = new IniConfigSource(); | 55 | IConfigSource config = new IniConfigSource(); |
52 | config.AddConfig("Modules"); | 56 | config.AddConfig("Modules"); |
53 | config.AddConfig("GridService"); | 57 | config.AddConfig("GridService"); |
@@ -71,8 +75,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests | |||
71 | TestHelpers.InMethod(); | 75 | TestHelpers.InMethod(); |
72 | // log4net.Config.XmlConfigurator.Configure(); | 76 | // log4net.Config.XmlConfigurator.Configure(); |
73 | 77 | ||
74 | SetUp(); | ||
75 | |||
76 | // Create 4 regions | 78 | // Create 4 regions |
77 | GridRegion r1 = new GridRegion(); | 79 | GridRegion r1 = new GridRegion(); |
78 | r1.RegionName = "Test Region 1"; | 80 | r1.RegionName = "Test Region 1"; |