From 1aab81e23594e460c3926c1c9e0ef4d24a53ff4c Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Tue, 23 Sep 2008 21:56:38 +0000
Subject: couple of minor test cleanups to see if this gets us past the bamboo
 hump

---
 .nant/bamboo.build                               | 1 -
 OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs | 8 --------
 OpenSim/Data/Tests/BasicAssetTest.cs             | 2 +-
 OpenSim/Data/Tests/BasicInventoryTest.cs         | 2 +-
 OpenSim/Data/Tests/BasicRegionTest.cs            | 2 +-
 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 @@
     <exec program="rsync" workingdir="../doc" commandline="-az - - delete html/ /home/afrisby/public_html/docs/html/" />
 -->
  <!-- ensure a clean checkout each time -->
-   <delete dir="../" />
   </target>
 </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
         public void Init()
         {
             SuperInit();
-            try
-            {
-                log4net.Config.XmlConfigurator.Configure();
-            }
-            catch (Exception)
-            {
-                // I don't care, just leave log4net off
-            }
             
             file = Path.GetTempFileName() + ".db";
             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
             {
                 log4net.Config.XmlConfigurator.Configure();
             }
-            catch (Exception)
+            catch (Exception e)
             {
                 // I don't care, just leave log4net off
             }
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
             {
                 log4net.Config.XmlConfigurator.Configure();
             }
-            catch (Exception)
+            catch (Exception e)
             {
                 // I don't care, just leave log4net off
             }
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
             {
                 log4net.Config.XmlConfigurator.Configure();
             }
-            catch (Exception)
+            catch (Exception e)
             {
                 // I don't care, just leave log4net off
             }
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
             {
                 log4net.Config.XmlConfigurator.Configure();
             }
-            catch (Exception)
+            catch (Exception e)
             {
                 // I don't care, just leave log4net off
             }
-- 
cgit v1.1