[pypy-svn] r50814 - pypy/dist/pypy/module/clr/test

[antocuni at codespeak.net]

Author: antocuni
Date: Sun Jan 20 22:59:44 2008
New Revision: 50814

Added:
   pypy/dist/pypy/module/clr/test/__init__.py   (contents, props changed)
Modified:
   pypy/dist/pypy/module/clr/test/test_clr.py
   pypy/dist/pypy/module/clr/test/test_importer.py
Log:
skip tests if not using pythonnet



Added: pypy/dist/pypy/module/clr/test/__init__.py
==============================================================================
--- (empty file)
+++ pypy/dist/pypy/module/clr/test/__init__.py	Sun Jan 20 22:59:44 2008
@@ -0,0 +1 @@
+#

Modified: pypy/dist/pypy/module/clr/test/test_clr.py
==============================================================================
--- pypy/dist/pypy/module/clr/test/test_clr.py	(original)
+++ pypy/dist/pypy/module/clr/test/test_clr.py	Sun Jan 20 22:59:44 2008
@@ -1,6 +1,14 @@
 from pypy.conftest import gettestobjspace
-mscorlib = 'mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089'
+from pypy.module.clr.assemblyname import mscorlib
 
+def skip_if_not_pythonnet():
+    import py
+    try:
+        import clr
+    except ImportError:
+        py.test.skip('Must use pythonnet to access .NET libraries')
+
+skip_if_not_pythonnet()
 
 class AppTestDotnet:
     def setup_class(cls):

Modified: pypy/dist/pypy/module/clr/test/test_importer.py
==============================================================================
--- pypy/dist/pypy/module/clr/test/test_importer.py	(original)
+++ pypy/dist/pypy/module/clr/test/test_importer.py	Sun Jan 20 22:59:44 2008
@@ -1,4 +1,7 @@
 from pypy.conftest import gettestobjspace
+from pypy.module.clr.test.test_clr import skip_if_not_pythonnet
+
+skip_if_not_pythonnet()
 
 class AppTestDotnet:
     def setup_class(cls):