[pypy-commit] pypy default: Avoid using deprecated pytest features (i.e. yielding test cases and using test methods instead of test functions)

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: 
Changeset: r82589:96f67d31a0af
Date: 2016-02-27 16:18 +0100
http://bitbucket.org/pypy/pypy/changeset/96f67d31a0af/

Log:	Avoid using deprecated pytest features (i.e. yielding test cases and
	using test methods instead of test functions)

diff --git a/rpython/rtyper/test/test_rdict.py b/rpython/rtyper/test/test_rdict.py
--- a/rpython/rtyper/test/test_rdict.py
+++ b/rpython/rtyper/test/test_rdict.py
@@ -1182,118 +1182,113 @@
                 count_frees += 1
         assert count_frees >= 3
 
-class TestStress:
 
-    def test_stress(self):
-        from rpython.annotator.dictdef import DictKey, DictValue
-        from rpython.annotator import model as annmodel
-        dictrepr = rdict.DictRepr(None, rint.signed_repr, rint.signed_repr,
-                                  DictKey(None, annmodel.SomeInteger()),
-                                  DictValue(None, annmodel.SomeInteger()))
-        dictrepr.setup()
-        l_dict = rdict.ll_newdict(dictrepr.DICT)
-        referencetable = [None] * 400
-        referencelength = 0
-        value = 0
+def test_stress():
+    from rpython.annotator.dictdef import DictKey, DictValue
+    from rpython.annotator import model as annmodel
+    dictrepr = rdict.DictRepr(None, rint.signed_repr, rint.signed_repr,
+                                DictKey(None, annmodel.SomeInteger()),
+                                DictValue(None, annmodel.SomeInteger()))
+    dictrepr.setup()
+    l_dict = rdict.ll_newdict(dictrepr.DICT)
+    referencetable = [None] * 400
+    referencelength = 0
+    value = 0
 
-        def complete_check():
-            for n, refvalue in zip(range(len(referencetable)), referencetable):
-                try:
-                    gotvalue = rdict.ll_dict_getitem(l_dict, n)
-                except KeyError:
-                    assert refvalue is None
-                else:
-                    assert gotvalue == refvalue
+    def complete_check():
+        for n, refvalue in zip(range(len(referencetable)), referencetable):
+            try:
+                gotvalue = rdict.ll_dict_getitem(l_dict, n)
+            except KeyError:
+                assert refvalue is None
+            else:
+                assert gotvalue == refvalue
 
-        for x in not_really_random():
-            n = int(x*100.0)    # 0 <= x < 400
-            op = repr(x)[-1]
-            if op <= '2' and referencetable[n] is not None:
-                rdict.ll_dict_delitem(l_dict, n)
-                referencetable[n] = None
-                referencelength -= 1
-            elif op <= '6':
-                rdict.ll_dict_setitem(l_dict, n, value)
-                if referencetable[n] is None:
-                    referencelength += 1
-                referencetable[n] = value
-                value += 1
+    for x in not_really_random():
+        n = int(x*100.0)    # 0 <= x < 400
+        op = repr(x)[-1]
+        if op <= '2' and referencetable[n] is not None:
+            rdict.ll_dict_delitem(l_dict, n)
+            referencetable[n] = None
+            referencelength -= 1
+        elif op <= '6':
+            rdict.ll_dict_setitem(l_dict, n, value)
+            if referencetable[n] is None:
+                referencelength += 1
+            referencetable[n] = value
+            value += 1
+        else:
+            try:
+                gotvalue = rdict.ll_dict_getitem(l_dict, n)
+            except KeyError:
+                assert referencetable[n] is None
             else:
-                try:
-                    gotvalue = rdict.ll_dict_getitem(l_dict, n)
-                except KeyError:
-                    assert referencetable[n] is None
-                else:
-                    assert gotvalue == referencetable[n]
-            if 1.38 <= x <= 1.39:
-                complete_check()
-                print 'current dict length:', referencelength
-            assert l_dict.num_items == referencelength
-        complete_check()
+                assert gotvalue == referencetable[n]
+        if 1.38 <= x <= 1.39:
+            complete_check()
+            print 'current dict length:', referencelength
+        assert l_dict.num_items == referencelength
+    complete_check()
 
-    def test_stress_2(self):
-        yield self.stress_combination, True,  False
-        yield self.stress_combination, False, True
-        yield self.stress_combination, False, False
-        yield self.stress_combination, True,  True
+ at py.test.mark.parametrize('key_can_be_none', [True, False])
+ at py.test.mark.parametrize('value_can_be_none', [True, False])
+def test_stress_2(key_can_be_none, value_can_be_none):
+    from rpython.rtyper.lltypesystem.rstr import string_repr
+    from rpython.annotator.dictdef import DictKey, DictValue
+    from rpython.annotator import model as annmodel
 
-    def stress_combination(self, key_can_be_none, value_can_be_none):
-        from rpython.rtyper.lltypesystem.rstr import string_repr
-        from rpython.annotator.dictdef import DictKey, DictValue
-        from rpython.annotator import model as annmodel
+    print
+    print "Testing combination with can_be_None: keys %s, values %s" % (
+        key_can_be_none, value_can_be_none)
 
-        print
-        print "Testing combination with can_be_None: keys %s, values %s" % (
-            key_can_be_none, value_can_be_none)
+    class PseudoRTyper:
+        cache_dummy_values = {}
+    dictrepr = rdict.DictRepr(PseudoRTyper(), string_repr, string_repr,
+                    DictKey(None, annmodel.SomeString(key_can_be_none)),
+                    DictValue(None, annmodel.SomeString(value_can_be_none)))
+    dictrepr.setup()
+    print dictrepr.lowleveltype
+    for key, value in dictrepr.DICTENTRY._adtmeths.items():
+        print '    %s = %s' % (key, value)
+    l_dict = rdict.ll_newdict(dictrepr.DICT)
+    referencetable = [None] * 400
+    referencelength = 0
+    values = not_really_random()
+    keytable = [string_repr.convert_const("foo%d" % n)
+                for n in range(len(referencetable))]
 
-        class PseudoRTyper:
-            cache_dummy_values = {}
-        dictrepr = rdict.DictRepr(PseudoRTyper(), string_repr, string_repr,
-                       DictKey(None, annmodel.SomeString(key_can_be_none)),
-                       DictValue(None, annmodel.SomeString(value_can_be_none)))
-        dictrepr.setup()
-        print dictrepr.lowleveltype
-        for key, value in dictrepr.DICTENTRY._adtmeths.items():
-            print '    %s = %s' % (key, value)
-        l_dict = rdict.ll_newdict(dictrepr.DICT)
-        referencetable = [None] * 400
-        referencelength = 0
-        values = not_really_random()
-        keytable = [string_repr.convert_const("foo%d" % n)
-                    for n in range(len(referencetable))]
+    def complete_check():
+        for n, refvalue in zip(range(len(referencetable)), referencetable):
+            try:
+                gotvalue = rdict.ll_dict_getitem(l_dict, keytable[n])
+            except KeyError:
+                assert refvalue is None
+            else:
+                assert gotvalue == refvalue
 
-        def complete_check():
-            for n, refvalue in zip(range(len(referencetable)), referencetable):
-                try:
-                    gotvalue = rdict.ll_dict_getitem(l_dict, keytable[n])
-                except KeyError:
-                    assert refvalue is None
-                else:
-                    assert gotvalue == refvalue
+    for x in not_really_random():
+        n = int(x*100.0)    # 0 <= x < 400
+        op = repr(x)[-1]
+        if op <= '2' and referencetable[n] is not None:
+            rdict.ll_dict_delitem(l_dict, keytable[n])
+            referencetable[n] = None
+            referencelength -= 1
+        elif op <= '6':
+            ll_value = string_repr.convert_const(str(values.next()))
+            rdict.ll_dict_setitem(l_dict, keytable[n], ll_value)
+            if referencetable[n] is None:
+                referencelength += 1
+            referencetable[n] = ll_value
+        else:
+            try:
+                gotvalue = rdict.ll_dict_getitem(l_dict, keytable[n])
+            except KeyError:
+                assert referencetable[n] is None
+            else:
+                assert gotvalue == referencetable[n]
+        if 1.38 <= x <= 1.39:
+            complete_check()
+            print 'current dict length:', referencelength
+        assert l_dict.num_items == referencelength
+    complete_check()
 
-        for x in not_really_random():
-            n = int(x*100.0)    # 0 <= x < 400
-            op = repr(x)[-1]
-            if op <= '2' and referencetable[n] is not None:
-                rdict.ll_dict_delitem(l_dict, keytable[n])
-                referencetable[n] = None
-                referencelength -= 1
-            elif op <= '6':
-                ll_value = string_repr.convert_const(str(values.next()))
-                rdict.ll_dict_setitem(l_dict, keytable[n], ll_value)
-                if referencetable[n] is None:
-                    referencelength += 1
-                referencetable[n] = ll_value
-            else:
-                try:
-                    gotvalue = rdict.ll_dict_getitem(l_dict, keytable[n])
-                except KeyError:
-                    assert referencetable[n] is None
-                else:
-                    assert gotvalue == referencetable[n]
-            if 1.38 <= x <= 1.39:
-                complete_check()
-                print 'current dict length:', referencelength
-            assert l_dict.num_items == referencelength
-        complete_check()
-