[pypy-commit] pypy py3.5: fix tests

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: py3.5
Changeset: r89656:4991383b53ef
Date: 2017-01-18 12:55 +0100
http://bitbucket.org/pypy/pypy/changeset/4991383b53ef/

Log:	fix tests

diff --git a/pypy/module/pypyjit/test_pypy_c/test_containers.py b/pypy/module/pypyjit/test_pypy_c/test_containers.py
--- a/pypy/module/pypyjit/test_pypy_c/test_containers.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_containers.py
@@ -10,7 +10,7 @@
                 pass
             a = A()
             a.x = 1
-            for s in sys.modules.keys() * 1000:
+            for s in list(sys.modules.keys()) * 1000:
                 d.get(s)  # force pending setfields etc.
                 inc = a.x # ID: look
                 d[s] = d.get(s, 0) + inc
@@ -64,11 +64,14 @@
             i8 = int_lt(i5, i7)
             guard_true(i8, descr=...)
             guard_not_invalidated(descr=...)
-            p10 = call_r(ConstClass(ll_str__IntegerR_SignedConst_Signed), i5, descr=<Callr . i EF=3>)
+            p109 = call_r(ConstClass(ll_str__IntegerR_SignedConst_Signed), i5, descr=<Callr . i EF=3>)
+            guard_no_exception(descr=...)
+            guard_nonnull(p109, descr=...)
+            p10 = call_r(ConstClass(ll_str2unicode__rpy_stringPtr), p109, descr=<Callr . r EF=4 OS=2>)
             guard_no_exception(descr=...)
             guard_nonnull(p10, descr=...)
-            i99 = strhash(p10)
-            i12 = cond_call_value_i(i99, ConstClass(_ll_strhash__rpy_stringPtr), p10, descr=<Calli . r EF=2>)
+            i99 = unicodehash(p10)
+            i12 = cond_call_value_i(i99, ConstClass(_ll_strhash__rpy_unicodePtr), p10, descr=<Calli . r EF=2>)
             p13 = new(descr=...)
             p15 = new_array_clear(16, descr=<ArrayU 1>)
             {{{
@@ -87,7 +90,7 @@
             call_n(ConstClass(_ll_dict_setitem_lookup_done_trampoline), p13, p10, p20, i12, i17, descr=<Callv 0 rrrii EF=5>)
             setfield_gc(p20, i5, descr=<FieldS .*W_IntObject.inst_intval .* pure>)
             guard_no_exception(descr=...)
-            i98 = strhash(p10)
+            i98 = unicodehash(p10)
             i23 = call_i(ConstClass(ll_call_lookup_function), p13, p10, i12, 0, descr=<Calli . rrii EF=5 OS=4>)
             guard_no_exception(descr=...)
             i27 = int_lt(i23, 0)
@@ -115,7 +118,7 @@
             while i < n:
                 z = list(())
                 z.append(1)
-                i += z[-1] / len(z)
+                i += z[-1] // len(z)
             return i
 
         log = self.run(main, [1000])
@@ -247,7 +250,7 @@
                 n -= 1
 
         log = self.run(main, [1000])
-        assert log.result == main(1000)
+        assert log.result == None
         loop, = log.loops_by_filename(self.filepath)
         ops = loop.ops_by_id('getitem', include_guard_not_invalidated=False)
         assert log.opnames(ops) == []