BUG: fix various tests issues preventing running under haas

cournape · Aug 31, 2014 · 365eef5 · 365eef5
1 parent 3566296
commit 365eef5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/bento/commands/tests/test_build.py b/bento/commands/tests/test_build.py
@@ -83,7 +83,7 @@
     Modules: fubar
 """
 
-class _TestBuildSimpleExtension(unittest.TestCase):
+class _TestBuildSimpleExtension(object):
     # Those should be set by subclasses
     _configure_context = None
     _build_context = None
@@ -249,7 +249,7 @@ def test_simple_inplace(self):
             for f in isection.files[0]:
                 self.assertTrue(op.exists(op.join(source_dir, f)))
 
-class TestBuildDistutils(_TestBuildSimpleExtension):
+class TestBuildDistutils(_TestBuildSimpleExtension, unittest.TestCase):
     def setUp(self):
         from bento.commands.build_distutils import DistutilsBuilder
         _TestBuildSimpleExtension.setUp(self)
@@ -274,9 +274,9 @@ def test_simple_library(self):
     def test_simple_extension(self):
         super(TestBuildDistutils, self).test_simple_extension()
 
-class TestBuildYaku(_TestBuildSimpleExtension):
+class TestBuildYaku(_TestBuildSimpleExtension, unittest.TestCase):
     def setUp(self):
-        super(TestBuildYaku, self).setUp()
+        _TestBuildSimpleExtension.setUp(self)
 
         self._configure_context = ConfigureYakuContext
         self._build_context = BuildYakuContext
@@ -318,7 +318,7 @@ def _not_has_waf():
 def skip_no_waf(f):
     return skip_if(_not_has_waf(), "waf not found")(f)
 
-class TestBuildWaf(_TestBuildSimpleExtension):
+class TestBuildWaf(_TestBuildSimpleExtension, unittest.TestCase):
     #def __init__(self, *a, **kw):
     #    super(TestBuildWaf, self).__init__(*a, **kw)
 
@@ -386,7 +386,7 @@ def setUp(self):
         self._fake_output = None
         self._stderr = sys.stderr
         self._stdout = sys.stdout
-        super(TestBuildWaf, self).setUp()
+        _TestBuildSimpleExtension.setUp(self)
         # XXX: ugly stuff to make waf and nose happy together
         sys.stdout = EncodedStringIO()
         sys.stderr = EncodedStringIO()

diff --git a/bento/compat/tests/__init__.py b/bento/compat/tests/__init__.py
diff --git a/bento/pypi/tests/__init__.py b/bento/pypi/tests/__init__.py