Skip to content

Commit b047e4c

Browse files
committed
Avoid getrefcount in memoryview tests
1 parent c22ecb4 commit b047e4c

File tree

2 files changed

+27
-10
lines changed

2 files changed

+27
-10
lines changed

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_memoryview.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_getbuf_fail
1212
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_getbuffer
1313
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_hash
14+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_refs
1415
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_setitem_readonly
1516
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_tolist
1617
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_writable_readonly
@@ -28,11 +29,14 @@
2829
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_delitem
2930
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_gc
3031
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_getbuf_fail
32+
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_getbuffer
33+
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_getitem
3134
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_hash
3235
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_hash_writable
3336
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_iter
3437
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_release
3538
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_reversed
39+
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_setitem_readonly
3640
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_tobytes
3741
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_tolist
3842
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_toreadonly
@@ -44,14 +48,19 @@
4448
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_delitem
4549
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_gc
4650
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_getbuf_fail
51+
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_getbuffer
52+
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_getitem
4753
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_hash
4854
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_hash_writable
4955
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_iter
56+
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_refs
5057
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_release
5158
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_reversed
59+
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_setitem_readonly
5260
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_tobytes
5361
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_tolist
5462
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_toreadonly
63+
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_weakref
5564
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_writable_readonly
5665
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_attributes_readonly
5766
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_attributes_writable
@@ -60,11 +69,14 @@
6069
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_delitem
6170
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_gc
6271
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_getbuf_fail
72+
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_getbuffer
73+
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_getitem
6374
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_hash
6475
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_hash_writable
6576
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_iter
6677
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_release
6778
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_reversed
79+
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_setitem_readonly
6880
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_tobytes
6981
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_tolist
7082
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_toreadonly

graalpython/lib-python/3/test/test_memoryview.py

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ def _types(self):
2828

2929
def check_getitem_with_type(self, tp):
3030
b = tp(self._source)
31-
oldrefcount = sys.getrefcount(b)
31+
# XXX GraalVM change - no refcount
32+
# oldrefcount = sys.getrefcount(b)
3233
m = self._view(b)
3334
self.assertEqual(m[0], ord(b"a"))
3435
self.assertIsInstance(m[0], int)
@@ -45,7 +46,7 @@ def check_getitem_with_type(self, tp):
4546
self.assertRaises(TypeError, lambda: m[0.0])
4647
self.assertRaises(TypeError, lambda: m["a"])
4748
m = None
48-
self.assertEqual(sys.getrefcount(b), oldrefcount)
49+
# self.assertEqual(sys.getrefcount(b), oldrefcount)
4950

5051
def test_getitem(self):
5152
for tp in self._types:
@@ -61,22 +62,24 @@ def test_setitem_readonly(self):
6162
if not self.ro_type:
6263
self.skipTest("no read-only type to test")
6364
b = self.ro_type(self._source)
64-
oldrefcount = sys.getrefcount(b)
65+
# XXX GraalVM change - no refcount
66+
# oldrefcount = sys.getrefcount(b)
6567
m = self._view(b)
6668
def setitem(value):
6769
m[0] = value
6870
self.assertRaises(TypeError, setitem, b"a")
6971
self.assertRaises(TypeError, setitem, 65)
7072
self.assertRaises(TypeError, setitem, memoryview(b"a"))
7173
m = None
72-
self.assertEqual(sys.getrefcount(b), oldrefcount)
74+
# self.assertEqual(sys.getrefcount(b), oldrefcount)
7375

7476
def test_setitem_writable(self):
7577
if not self.rw_type:
7678
self.skipTest("no writable type to test")
7779
tp = self.rw_type
7880
b = self.rw_type(self._source)
79-
oldrefcount = sys.getrefcount(b)
81+
# XXX GraalVM change - no refcount
82+
# oldrefcount = sys.getrefcount(b)
8083
m = self._view(b)
8184
m[0] = ord(b'1')
8285
self._check_contents(tp, b, b"1bcdef")
@@ -121,7 +124,7 @@ def setitem(key, value):
121124
self.assertRaises(ValueError, setitem, slice(0,2), b"a")
122125

123126
m = None
124-
self.assertEqual(sys.getrefcount(b), oldrefcount)
127+
# self.assertEqual(sys.getrefcount(b), oldrefcount)
125128

126129
def test_delitem(self):
127130
for tp in self._types:
@@ -205,14 +208,15 @@ def test_getbuffer(self):
205208
# Test PyObject_GetBuffer() on a memoryview object.
206209
for tp in self._types:
207210
b = tp(self._source)
208-
oldrefcount = sys.getrefcount(b)
211+
# XXX GraalVM change - no refcount
212+
# oldrefcount = sys.getrefcount(b)
209213
m = self._view(b)
210-
oldviewrefcount = sys.getrefcount(m)
214+
# oldviewrefcount = sys.getrefcount(m)
211215
s = str(m, "utf-8")
212216
self._check_contents(tp, b, s.encode("utf-8"))
213-
self.assertEqual(sys.getrefcount(m), oldviewrefcount)
217+
# self.assertEqual(sys.getrefcount(m), oldviewrefcount)
214218
m = None
215-
self.assertEqual(sys.getrefcount(b), oldrefcount)
219+
# self.assertEqual(sys.getrefcount(b), oldrefcount)
216220

217221
def test_gc(self):
218222
for tp in self._types:
@@ -443,6 +447,7 @@ def _view(self, obj):
443447
def _check_contents(self, tp, obj, contents):
444448
self.assertEqual(obj[1:7], tp(contents))
445449

450+
@test.support.impl_detail("refcounting", graalvm=False)
446451
def test_refs(self):
447452
for tp in self._types:
448453
m = memoryview(tp(self._source))

0 commit comments

Comments
 (0)