[conduit: 8/138] Don't fail

[John Carr <johncarr src gnome org>]

commit 3535f7cf70405303237efeea539a5f9d3108f760
Author: John Carr <john carr unrouted co uk>
Date:   Sun Apr 19 19:07:46 2009 +0100

    Don't fail
---
 test/soup/__init__.py          |    4 +---
 test/soup/modules/__init__.py  |    1 +
 test/soup/test_dataprovider.py |    7 +++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/test/soup/__init__.py b/test/soup/__init__.py
index 37c47f4..c66bb2f 100644
--- a/test/soup/__init__.py
+++ b/test/soup/__init__.py
@@ -7,9 +7,7 @@ CHANGE_DELETE = 3
 
 class BaseTest(unittest.TestCase):
 
-    def __init__(self):
-        super(BaseTest, self).__init__()
-
+    def grumpy(self):
         #Set up our own mapping DB so we dont pollute the global one
         dbFile = os.path.join(os.environ['TEST_DIRECTORY'],Utils.random_string()+".db")
         conduit.GLOBALS.mappingDB = MappingDB.MappingDB(dbFile)
diff --git a/test/soup/modules/__init__.py b/test/soup/modules/__init__.py
index 0883878..d733a1e 100644
--- a/test/soup/modules/__init__.py
+++ b/test/soup/modules/__init__.py
@@ -39,5 +39,6 @@ class ModuleWrapper(object):
 
 def all():
     """ Load all plugin wrappers and return everything that subclasses ModuleWrapper """
+    import folder
     return ModuleWrapper.__class__.__subclasses__
 
diff --git a/test/soup/test_dataprovider.py b/test/soup/test_dataprovider.py
index b3e81e5..8497432 100644
--- a/test/soup/test_dataprovider.py
+++ b/test/soup/test_dataprovider.py
@@ -2,7 +2,7 @@ import unittest
 
 import soup
 
-class TestDataprovider(soup.BaseTest):
+class DataproviderTest(soup.BaseTest):
 
     def test_add(self):
         pass
@@ -27,7 +27,10 @@ class TestDataproviders(unittest.TestSuite):
     def __init__(self, tests=None):
         tests = []
         for mod in soup.modules.all():
-            tests.append(TestDataprovider(mod))
+            tests.append(TestDataprovider)
 
         super(TestDataproviders, self).__init__(tests)
 
+if __name__ == "__main__":
+    unittest.main()
+