diff --git a/eval.py b/eval.py index 49e84829fccb7798c1889ad001a93653c71f8e41..863bb0ab0eea8a337a3a4cca93d9bdae2f92b7ae 100755 --- a/eval.py +++ b/eval.py @@ -309,10 +309,10 @@ def cmd_run(cmd: str, cwd=None, env=None, verbose=False, check=True): env=env, check=check, cwd=cwd) - except subprocess.CalledProcessError as err: - print(f'subcommand failed: {err}') - print(f'{err.stderr}') - raise err + except subprocess.CalledProcessError as run_err: + print(f'subcommand failed: {run_err}') + print(f'{run_err.stderr}') + raise run_err def checkout_emper_worktree(directory, checkout, verbose=False): @@ -428,9 +428,9 @@ def shutdown_server(server: subprocess.Popen, verbose=False): # try to shutdown by sending "quit" to the server try: subprocess.run(termination_cmd.split(), input=b'quit\n', check=True) - except subprocess.CalledProcessError as err: + except subprocess.CalledProcessError as run_err: if verbose: - print(f'{termination_cmd} terminated unsuccessful: {err}') + print(f'{termination_cmd} terminated unsuccessful: {run_err}') # wait for the server to terminate try: @@ -586,9 +586,9 @@ def bench(verbose=False) -> Dict[str, List[List[BenchResult]]]: bench_results[i] = BenchResult.OK - except subprocess.CalledProcessError as err: + except subprocess.CalledProcessError as run_err: print('\nClient cmd failed. Terminate server') - print(f'Client terminated unsuccessful: {err}', + print(f'Client terminated unsuccessful: {run_err}', file=cerr) bench_results[i] = BenchResult.FAIL break