Skip to content

Commit 9a5dd9d

Browse files
committed
derive test tmp target dir from test name in test_standalone
1 parent cbc8130 commit 9a5dd9d

File tree

1 file changed

+10
-15
lines changed

1 file changed

+10
-15
lines changed

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

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,8 @@ def create_test_pom(self, template, pom):
246246

247247
@unittest.skipUnless(is_enabled, "ENABLE_STANDALONE_UNITTESTS is not true")
248248
def test_generated_app(self):
249-
250249
with tempfile.TemporaryDirectory() as tmpdir:
251-
target_name = "polyglot_app_test"
250+
target_name = "generated_app_test"
252251
target_dir = os.path.join(str(tmpdir), target_name)
253252
self.generate_app(tmpdir, target_dir, target_name)
254253

@@ -272,7 +271,7 @@ def test_generated_app(self):
272271
assert "/vfs/home/lib-python/\n" in lines
273272

274273
# execute and check native image
275-
cmd = [os.path.join(target_dir, "target", "polyglot_app_test")]
274+
cmd = [os.path.join(target_dir, "target", target_name)]
276275
out, return_code = run_cmd(cmd, self.env, cwd=target_dir)
277276
assert "hello java" in out
278277

@@ -287,9 +286,8 @@ def test_generated_app(self):
287286

288287
@unittest.skipUnless(is_enabled, "ENABLE_STANDALONE_UNITTESTS is not true")
289288
def test_graalpy_exec(self):
290-
291289
with tempfile.TemporaryDirectory() as tmpdir:
292-
target_name = "polyglot_app_test"
290+
target_name = "graalpy_exec_test"
293291
target_dir = os.path.join(str(tmpdir), target_name)
294292
self.generate_app(tmpdir, target_dir, target_name)
295293

@@ -315,9 +313,8 @@ def test_graalpy_exec(self):
315313

316314
@unittest.skipUnless(is_enabled, "ENABLE_STANDALONE_UNITTESTS is not true")
317315
def test_fail_without_graalpy_dep(self):
318-
319316
with tempfile.TemporaryDirectory() as tmpdir:
320-
target_name = "polyglot_app_test"
317+
target_name = "fail_without_graalpy_dep_test"
321318
target_dir = os.path.join(str(tmpdir), target_name)
322319
pom_template = os.path.join(os.path.dirname(__file__), "embedding/fail_without_graalpy_dep_pom.xml")
323320
self.generate_app(tmpdir, target_dir, target_name, pom_template)
@@ -327,7 +324,7 @@ def test_fail_without_graalpy_dep(self):
327324
cmd = MVN_CMD + ["dependency:purge-local-repository", f"-Dgraalpy.version={self.graalvmVersion}", "-Dgraalpy.edition=python-community"]
328325
run_cmd(cmd, self.env, cwd=target_dir)
329326
try:
330-
cmd = MVN_CMD + ["process-resources"]
327+
cmd = MVN_CMD + ["-X", "process-resources"]
331328
out, return_code = run_cmd(cmd, self.env, cwd=target_dir)
332329
assert "Missing GraalPy dependency org.graalvm.python:python-language" in out
333330

@@ -338,9 +335,8 @@ def test_fail_without_graalpy_dep(self):
338335

339336
@unittest.skipUnless(is_enabled, "ENABLE_STANDALONE_UNITTESTS is not true")
340337
def test_gen_launcher_and_venv(self):
341-
342338
with tempfile.TemporaryDirectory() as tmpdir:
343-
target_name = "polyglot_app_test"
339+
target_name = "gen_launcher_and_venv_test"
344340
target_dir = os.path.join(str(tmpdir), target_name)
345341
pom_template = os.path.join(os.path.dirname(__file__), "embedding/prepare_venv_pom.xml")
346342
self.generate_app(tmpdir, target_dir, target_name, pom_template)
@@ -349,7 +345,7 @@ def test_gen_launcher_and_venv(self):
349345
cmd = MVN_CMD + ["dependency:purge-local-repository", f"-Dgraalpy.version={self.graalvmVersion}", "-Dgraalpy.edition=python-community"]
350346
run_cmd(cmd, self.env, cwd=target_dir)
351347
try:
352-
cmd = MVN_CMD + ["process-resources"]
348+
cmd = MVN_CMD + ["-X", "process-resources"]
353349
out, return_code = run_cmd(cmd, self.env, cwd=target_dir)
354350
assert "-m venv" in out
355351
assert "-m ensurepip" in out
@@ -371,9 +367,8 @@ def test_gen_launcher_and_venv(self):
371367

372368
@unittest.skipUnless(is_enabled, "ENABLE_STANDALONE_UNITTESTS is not true")
373369
def test_check_home(self):
374-
375-
with tempfile.TemporaryDirectory() as tmpdir:
376-
target_name = "polyglot_app_test"
370+
with tempfile.TemporaryDirectory() as tmpdir:
371+
target_name = "check_home_test"
377372
target_dir = os.path.join(str(tmpdir), target_name)
378373
pom_template = os.path.join(os.path.dirname(__file__), "embedding/check_home_pom.xml")
379374
self.generate_app(tmpdir, target_dir, target_name, pom_template)
@@ -384,7 +379,7 @@ def test_check_home(self):
384379
run_cmd(cmd, self.env, cwd=target_dir)
385380

386381
try:
387-
cmd = MVN_CMD + ["process-resources"]
382+
cmd = MVN_CMD + ["-X", "process-resources"]
388383
out, return_code = run_cmd(cmd, self.env, cwd=target_dir)
389384

390385
# check fileslist.txt

0 commit comments

Comments
 (0)