[pypy-commit] pypy py3k: add an applevel py3k_skip, and py3k_skip some multidict tests

[antocuni]

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: py3k
Changeset: r54471:8868ac4174b0
Date: 2012-04-17 16:00 +0200
http://bitbucket.org/pypy/pypy/changeset/8868ac4174b0/

Log:	add an applevel py3k_skip, and py3k_skip some multidict tests

diff --git a/pypy/conftest.py b/pypy/conftest.py
--- a/pypy/conftest.py
+++ b/pypy/conftest.py
@@ -116,6 +116,8 @@
                   space.wrap(appsupport.app_raises))
     space.setitem(space.builtin.w_dict, space.wrap('skip'),
                   space.wrap(appsupport.app_skip))
+    space.setitem(space.builtin.w_dict, space.wrap('py3k_skip'),
+                  space.wrap(appsupport.app_py3k_skip))
     space.raises_w = appsupport.raises_w.__get__(space)
     space.eq_w = appsupport.eq_w.__get__(space)
     return space
diff --git a/pypy/objspace/std/test/test_dictmultiobject.py b/pypy/objspace/std/test/test_dictmultiobject.py
--- a/pypy/objspace/std/test/test_dictmultiobject.py
+++ b/pypy/objspace/std/test/test_dictmultiobject.py
@@ -143,6 +143,7 @@
         assert space.eq_w(w_d.getitem_str("b"), space.w_None)
 
     def test_listview_str_dict(self):
+        py.test.py3k_skip("StringDictStrategy not supported yet")
         w = self.space.wrap
 
         w_d = self.space.newdict()
@@ -151,6 +152,7 @@
         assert self.space.listview_str(w_d) == ["a", "b"]
 
     def test_listview_int_dict(self):
+        py.test.py3k_skip("IntDictStrategy not supported yet")
         w = self.space.wrap
         w_d = self.space.newdict()
         w_d.initialize_content([(w(1), w("a")), (w(2), w("b"))])
@@ -781,6 +783,7 @@
         return r[r.find("(") + 1: r.find(")")]
 
     def test_empty_to_string(self):
+        py3k_skip("StringDictStrategy not supported yet")
         d = {}
         assert "EmptyDictStrategy" in self.get_strategy(d)
         d["a"] = 1
diff --git a/pypy/tool/pytest/appsupport.py b/pypy/tool/pytest/appsupport.py
--- a/pypy/tool/pytest/appsupport.py
+++ b/pypy/tool/pytest/appsupport.py
@@ -261,6 +261,13 @@
 
 app_skip = gateway.interp2app_temp(pypyskip)
 
+def py3k_pypyskip(space, w_message): 
+    """skip a test at app-level. """ 
+    msg = space.unwrap(w_message) 
+    py.test.skip('[py3k] %s' % msg)
+
+app_py3k_skip = gateway.interp2app_temp(py3k_pypyskip)
+
 def raises_w(space, w_ExpectedException, *args, **kwds):
     try:
         excinfo = py.test.raises(OperationError, *args, **kwds)