Skip to content

Commit 464aca2

Browse files
committed
Run sandboxed tests with java compression backend
1 parent 7f3cede commit 464aca2

File tree

4 files changed

+1
-41
lines changed

4 files changed

+1
-41
lines changed

graalpython/com.oracle.graal.python.test/src/tests/test_zlib.py

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,6 @@
22
# Copyright (C) 1996-2017 Python Software Foundation
33
#
44
# Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
5-
6-
try:
7-
__graalpython__.zlib_module_backend()
8-
except:
9-
class GP:
10-
def zlib_module_backend(self):
11-
return 'cpython'
12-
13-
def _disable_native_zlib(self, flag):
14-
return None
15-
__graalpython__ = GP()
16-
175
import binascii
186
import os
197
import random
@@ -258,8 +246,6 @@ def test_GR65704():
258246
contents = b"The quick brown fox jumped over the lazy dog"
259247
wbits = 27
260248

261-
__graalpython__._disable_native_zlib(True)
262-
263249
compressed = zlib.compress(contents, wbits=wbits)
264250
decompressor = zlib.decompressobj(wbits=wbits)
265251

@@ -269,38 +255,28 @@ def test_GR65704():
269255
decompressed += out
270256
decompressed += decompressor.flush()
271257

272-
__graalpython__._disable_native_zlib(False)
273-
274258
assert decompressed == contents
275259

276260
def test_large_chunk():
277261
contents = random.randbytes(5000)
278262
wbits = 31
279263

280-
__graalpython__._disable_native_zlib(True)
281-
282264
compressed = zlib.compress(contents, wbits=wbits)
283265
decompressor = zlib.decompressobj(wbits=wbits)
284266

285267
decompressed = decompressor.decompress(compressed)
286268

287-
__graalpython__._disable_native_zlib(False)
288-
289269
assert decompressed == contents
290270

291271
def test_various_chunks():
292272
contents = random.randbytes(5000)
293273
wbits = 31
294274

295-
__graalpython__._disable_native_zlib(True)
296-
297275
compressed = zlib.compress(contents, wbits=wbits)
298276
decompressor = zlib.decompressobj(wbits=wbits)
299277

300278
decompressed = decompressor.decompress(compressed[:10])
301279
decompressed += decompressor.decompress(compressed[10:200])
302280
decompressed += decompressor.decompress(compressed[200:])
303281

304-
__graalpython__._disable_native_zlib(False)
305-
306282
assert decompressed == contents

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/GraalPythonModuleBuiltins.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1263,18 +1263,4 @@ static Object create(VirtualFrame frame, Object cls,
12631263
return objectNode.execute(frame, cls, PythonUtils.EMPTY_OBJECT_ARRAY, PKeyword.EMPTY_KEYWORDS);
12641264
}
12651265
}
1266-
1267-
@Builtin(name = "_disable_native_zlib", minNumOfPositionalArgs = 1)
1268-
@GenerateNodeFactory
1269-
abstract static class DisableNativeZlibNode extends PythonUnaryBuiltinNode {
1270-
@Specialization
1271-
Object disableNativeZlib(boolean disable) {
1272-
if (disable) {
1273-
getContext().getNFIZlibSupport().notAvailable();
1274-
} else {
1275-
getContext().getNFIZlibSupport().setAvailable();
1276-
}
1277-
return PNone.NONE;
1278-
}
1279-
}
12801266
}

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
class GP:
1616
def zlib_module_backend(self):
1717
return 'cpython'
18-
19-
def _disable_native_zlib(self):
20-
return None
2118
__graalpython__ = GP()
2219

2320
zlib = import_helper.import_module('zlib')

mx.graalpython/mx_graalpython.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ def get_boolean_env(name, default=False):
116116
'--experimental-options',
117117
'--python.PosixModuleBackend=java',
118118
'--python.Sha3ModuleBackend=java',
119+
'--python.CompressionModulesBackend=java'
119120
]
120121

121122

0 commit comments

Comments
 (0)