Skip to content

Commit 93b75b7

Browse files
committed
[GR-36912] Enable structargs test
PullRequest: graalpython/2146
2 parents bc37aad + ba51a22 commit 93b75b7

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

ci.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "overlay": "6176531f89b51af931ba73cc53df24b7457bc46f" }
1+
{ "overlay": "3364703e8602f00654aaa86e94888b1464f3d4d1" }

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -261,11 +261,11 @@ def test_iter_unpack():
261261
assert lh(it) == 0
262262

263263

264-
# def test_pack_varargs():
265-
# assert struct.Struct(">B").pack(3) == b'\x03'
266-
# raised = False
267-
# try:
268-
# struct.Struct(">B").pack(3, kw=1)
269-
# except TypeError:
270-
# raised = True
271-
# assert raised
264+
def test_pack_varargs():
265+
assert struct.Struct(">B").pack(3) == b'\x03'
266+
raised = False
267+
try:
268+
struct.Struct(">B").pack(3, kw=1)
269+
except TypeError:
270+
raised = True
271+
assert raised

mx.graalpython/mx_graalpython.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,12 +1185,12 @@ def update_import_cmd(args):
11851185
# update vm-tests.json vm version
11861186
with open(join(overlaydir, "python", "graal-common.json"), 'r') as fp:
11871187
d = json.load(fp)
1188-
oraclejdk8_ver = d['jdks']['oraclejdk8']['version']
1188+
oraclejdk17_ver = d['jdks']['oraclejdk17']['version']
11891189

11901190
with open(join(overlaydir, "python", "vm-tests.json"), 'r') as fp:
11911191
d = json.load(fp)
11921192
for job in d:
1193-
job['downloads']['JAVA_HOME']['version'] = oraclejdk8_ver
1193+
job['downloads']['JAVA_HOME']['version'] = oraclejdk17_ver
11941194

11951195
with open(join(overlaydir, "python", "vm-tests.json"), 'w') as fp:
11961196
json.dump(d, fp, indent=2)

mx.graalpython/suite.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,23 +44,23 @@
4444
},
4545
{
4646
"name": "tools",
47-
"version": "9b25754d49ca0fec016b1f4c03999f09fdb07404",
47+
"version": "d9667a6ed800b86f14e9b7274fdea5764e12ce20",
4848
"subdir": True,
4949
"urls": [
5050
{"url": "https://github.com/oracle/graal", "kind": "git"},
5151
],
5252
},
5353
{
5454
"name": "sulong",
55-
"version": "9b25754d49ca0fec016b1f4c03999f09fdb07404",
55+
"version": "d9667a6ed800b86f14e9b7274fdea5764e12ce20",
5656
"subdir": True,
5757
"urls": [
5858
{"url": "https://github.com/oracle/graal", "kind": "git"},
5959
]
6060
},
6161
{
6262
"name": "regex",
63-
"version": "9b25754d49ca0fec016b1f4c03999f09fdb07404",
63+
"version": "d9667a6ed800b86f14e9b7274fdea5764e12ce20",
6464
"subdir": True,
6565
"urls": [
6666
{"url": "https://github.com/oracle/graal", "kind": "git"},

0 commit comments

Comments
 (0)