diff options
author | Sean Dague | 2008-09-23 21:56:38 +0000 |
---|---|---|
committer | Sean Dague | 2008-09-23 21:56:38 +0000 |
commit | 1aab81e23594e460c3926c1c9e0ef4d24a53ff4c (patch) | |
tree | 533a6bc98b7491bf08a74329919f977b8eb05de9 | |
parent | commit the .config to see if that gets us over the bamboo hump (diff) | |
download | opensim-SC-1aab81e23594e460c3926c1c9e0ef4d24a53ff4c.zip opensim-SC-1aab81e23594e460c3926c1c9e0ef4d24a53ff4c.tar.gz opensim-SC-1aab81e23594e460c3926c1c9e0ef4d24a53ff4c.tar.bz2 opensim-SC-1aab81e23594e460c3926c1c9e0ef4d24a53ff4c.tar.xz |
couple of minor test cleanups to see if this gets us past the bamboo hump
-rw-r--r-- | .nant/bamboo.build | 1 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs | 8 | ||||
-rw-r--r-- | OpenSim/Data/Tests/BasicAssetTest.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/Tests/BasicInventoryTest.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/Tests/BasicRegionTest.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/Tests/BasicUserTest.cs | 2 |
6 files changed, 4 insertions, 13 deletions
diff --git a/.nant/bamboo.build b/.nant/bamboo.build index 42d0b22..e3fbe4d 100644 --- a/.nant/bamboo.build +++ b/.nant/bamboo.build | |||
@@ -68,6 +68,5 @@ | |||
68 | <exec program="rsync" workingdir="../doc" commandline="-az - - delete html/ /home/afrisby/public_html/docs/html/" /> | 68 | <exec program="rsync" workingdir="../doc" commandline="-az - - delete html/ /home/afrisby/public_html/docs/html/" /> |
69 | --> | 69 | --> |
70 | <!-- ensure a clean checkout each time --> | 70 | <!-- ensure a clean checkout each time --> |
71 | <delete dir="../" /> | ||
72 | </target> | 71 | </target> |
73 | </project> | 72 | </project> |
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs index 55a1f75..571aa85 100644 --- a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs +++ b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs | |||
@@ -49,14 +49,6 @@ namespace OpenSim.Data.SQLite.Tests | |||
49 | public void Init() | 49 | public void Init() |
50 | { | 50 | { |
51 | SuperInit(); | 51 | SuperInit(); |
52 | try | ||
53 | { | ||
54 | log4net.Config.XmlConfigurator.Configure(); | ||
55 | } | ||
56 | catch (Exception) | ||
57 | { | ||
58 | // I don't care, just leave log4net off | ||
59 | } | ||
60 | 52 | ||
61 | file = Path.GetTempFileName() + ".db"; | 53 | file = Path.GetTempFileName() + ".db"; |
62 | connect = "URI=file:" + file + ",version=3"; | 54 | connect = "URI=file:" + file + ",version=3"; |
diff --git a/OpenSim/Data/Tests/BasicAssetTest.cs b/OpenSim/Data/Tests/BasicAssetTest.cs index e40bccb..89b86eb 100644 --- a/OpenSim/Data/Tests/BasicAssetTest.cs +++ b/OpenSim/Data/Tests/BasicAssetTest.cs | |||
@@ -49,7 +49,7 @@ namespace OpenSim.Data.Tests | |||
49 | { | 49 | { |
50 | log4net.Config.XmlConfigurator.Configure(); | 50 | log4net.Config.XmlConfigurator.Configure(); |
51 | } | 51 | } |
52 | catch (Exception) | 52 | catch (Exception e) |
53 | { | 53 | { |
54 | // I don't care, just leave log4net off | 54 | // I don't care, just leave log4net off |
55 | } | 55 | } |
diff --git a/OpenSim/Data/Tests/BasicInventoryTest.cs b/OpenSim/Data/Tests/BasicInventoryTest.cs index ea8e4e8..ebba081 100644 --- a/OpenSim/Data/Tests/BasicInventoryTest.cs +++ b/OpenSim/Data/Tests/BasicInventoryTest.cs | |||
@@ -69,7 +69,7 @@ namespace OpenSim.Data.Tests | |||
69 | { | 69 | { |
70 | log4net.Config.XmlConfigurator.Configure(); | 70 | log4net.Config.XmlConfigurator.Configure(); |
71 | } | 71 | } |
72 | catch (Exception) | 72 | catch (Exception e) |
73 | { | 73 | { |
74 | // I don't care, just leave log4net off | 74 | // I don't care, just leave log4net off |
75 | } | 75 | } |
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs index f9c5565..6f0160f 100644 --- a/OpenSim/Data/Tests/BasicRegionTest.cs +++ b/OpenSim/Data/Tests/BasicRegionTest.cs | |||
@@ -51,7 +51,7 @@ namespace OpenSim.Data.Tests | |||
51 | { | 51 | { |
52 | log4net.Config.XmlConfigurator.Configure(); | 52 | log4net.Config.XmlConfigurator.Configure(); |
53 | } | 53 | } |
54 | catch (Exception) | 54 | catch (Exception e) |
55 | { | 55 | { |
56 | // I don't care, just leave log4net off | 56 | // I don't care, just leave log4net off |
57 | } | 57 | } |
diff --git a/OpenSim/Data/Tests/BasicUserTest.cs b/OpenSim/Data/Tests/BasicUserTest.cs index 9587d86..36c8e21 100644 --- a/OpenSim/Data/Tests/BasicUserTest.cs +++ b/OpenSim/Data/Tests/BasicUserTest.cs | |||
@@ -49,7 +49,7 @@ namespace OpenSim.Data.Tests | |||
49 | { | 49 | { |
50 | log4net.Config.XmlConfigurator.Configure(); | 50 | log4net.Config.XmlConfigurator.Configure(); |
51 | } | 51 | } |
52 | catch (Exception) | 52 | catch (Exception e) |
53 | { | 53 | { |
54 | // I don't care, just leave log4net off | 54 | // I don't care, just leave log4net off |
55 | } | 55 | } |