[pypy-svn] r58992 - in pypy/branch/cbuild-refactor/pypy/translator/platform: . test

[pedronis at codespeak.net]

Author: pedronis
Date: Sat Oct 11 18:24:11 2008
New Revision: 58992

Modified:
   pypy/branch/cbuild-refactor/pypy/translator/platform/maemo.py
   pypy/branch/cbuild-refactor/pypy/translator/platform/test/test_maemo.py
Log:
(fjal, pedronis)

properly skip maemo test if there is no scratchbox



Modified: pypy/branch/cbuild-refactor/pypy/translator/platform/maemo.py
==============================================================================
--- pypy/branch/cbuild-refactor/pypy/translator/platform/maemo.py	(original)
+++ pypy/branch/cbuild-refactor/pypy/translator/platform/maemo.py	Sat Oct 11 18:24:11 2008
@@ -1,8 +1,8 @@
-
+import py
 from pypy.translator.platform.linux import Linux, _run_subprocess
 from pypy.translator.platform import ExecutionResult, log
 
-def check_scratchbox(self):
+def check_scratchbox():
     if not py.path.local('/scratchbox/login').check():
         py.test.skip("No scratchbox detected")
 

Modified: pypy/branch/cbuild-refactor/pypy/translator/platform/test/test_maemo.py
==============================================================================
--- pypy/branch/cbuild-refactor/pypy/translator/platform/test/test_maemo.py	(original)
+++ pypy/branch/cbuild-refactor/pypy/translator/platform/test/test_maemo.py	Sat Oct 11 18:24:11 2008
@@ -8,3 +8,6 @@
 class TestMaemo(BasicTest):
     platform = Maemo()
     strict_on_stderr = False
+
+    def setup_class(cls):
+        check_scratchbox()