From 0bef28a70042330574d75b8a026bdd80fcae90b8 Mon Sep 17 00:00:00 2001 From: Ben Clifford Date: Mon, 27 Mar 2023 09:29:05 +0000 Subject: [PATCH] Revert test hacking --- parsl/tests/test_bash_apps/test_error_codes.py | 5 +---- parsl/tests/test_docs/test_from_slides.py | 17 +++++------------ 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/parsl/tests/test_bash_apps/test_error_codes.py b/parsl/tests/test_bash_apps/test_error_codes.py index 3bc9f8d358..38b2b9533d 100644 --- a/parsl/tests/test_bash_apps/test_error_codes.py +++ b/parsl/tests/test_bash_apps/test_error_codes.py @@ -1,5 +1,4 @@ import argparse -import logging import os import pytest @@ -13,8 +12,6 @@ from parsl.tests.configs.local_threads import fresh_config as local_config -logger = logging.getLogger(__name__) - @bash_app def command_not_found(stderr='std.err', stdout='std.out'): @@ -74,7 +71,7 @@ def test_div_0(test_fn=div_0): assert e.exitcode == err_code, "{0} expected err_code:{1} but got {2}".format(test_fn.__name__, err_code, e.exitcode) - logger.info(f"Current directory listing: {os.listdir('.')}") + print(os.listdir('.')) os.remove('std.err') os.remove('std.out') return True diff --git a/parsl/tests/test_docs/test_from_slides.py b/parsl/tests/test_docs/test_from_slides.py index 3245d3ca2c..09f5e86f93 100644 --- a/parsl/tests/test_docs/test_from_slides.py +++ b/parsl/tests/test_docs/test_from_slides.py @@ -2,12 +2,11 @@ from parsl.data_provider.files import File import os -import pytest @bash_app def echo(message, outputs=[]): - return 'pwd > /tmp/xx2; echo {o} >> /tmp/xx2 ; echo {m} &> {o}'.format(m=message, o=outputs[0]) + return 'echo {m} &> {o}'.format(m=message, o=outputs[0]) @python_app @@ -19,19 +18,13 @@ def cat(inputs=[]): def test_slides(): """Testing code snippet from slides """ - input_message = "Hello World!" - if os.path.exists('hello1.txt'): os.remove('hello1.txt') - hello = echo(input_message, outputs=[File('hello1.txt')]) + hello = echo("Hello World!", outputs=[File('hello1.txt')]) message = cat(inputs=[hello.outputs[0]]) - assert hello.exception() is None - - # this should exist as soon as hello is finished - assert os.path.exists('hello1.txt') - - assert len(message.result()) == 1 - assert message.result()[0].strip() == input_message + # Waits. This need not be in the slides. + print(hello.result()) + print(message.result())