From 3e66d9ab39619857b75f33abfbd1912f6a2dfd8e Mon Sep 17 00:00:00 2001 From: Ben Clifford Date: Tue, 23 May 2023 17:27:11 +0200 Subject: [PATCH] Fix-up and re-enable regression test for issue #226 (#2703) --- parsl/tests/test_regression/test_226.py | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/parsl/tests/test_regression/test_226.py b/parsl/tests/test_regression/test_226.py index fd1a15981d..2f560466dc 100644 --- a/parsl/tests/test_regression/test_226.py +++ b/parsl/tests/test_regression/test_226.py @@ -7,9 +7,6 @@ import pytest from parsl.app.app import bash_app, python_app -from parsl.tests.configs.local_threads import config - -local_config = config class Foo: @@ -46,26 +43,20 @@ def echo(msg, postfix='there', stdout='std.out'): return 'echo {} {}'.format(msg, postfix) -blacklist = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'configs', '*ipp*') - - -# @pytest.mark.blacklist(blacklist, reason='hangs on Travis') -@pytest.mark.skip("Broke somewhere between PR #525 and PR #652") def test_no_eq(): res = get_foo_x('foo').result() assert res == 1, 'Expected 1, returned {}'.format(res) -# @pytest.mark.blacklist(blacklist, reason='hangs on Travis') -@pytest.mark.skip("Broke somewhere between PR #525 and PR #652") def test_get_dataframe(): res = get_dataframe().result() assert res.equals(data), 'Unexpected dataframe' -# @pytest.mark.blacklist(blacklist, reason='hangs on Travis') -@pytest.mark.skip("Broke somewhere between PR #525 and PR #652") def test_bash_default_arg(): + if os.path.exists('std.out'): + os.remove('std.out') + echo('hello').result() with open('std.out', 'r') as f: assert f.read().strip() == 'hello there', "Output should be 'hello there'"