From ffc4022c1ea2c2a5892150ff55e6c9a9ddbb8756 Mon Sep 17 00:00:00 2001
From: Scott <scott@wannabe.house>
Date: Tue, 11 Jan 2022 13:41:25 -0800
Subject: [PATCH] Fix a couple of bugs in executors. Use run_tests.sh as a pre
commit hook.
---
executors.py | 8 ++++----
tests/run_tests.sh | 2 ++
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/executors.py b/executors.py
index dabddf3..336f2c7 100644
--- a/executors.py
+++ b/executors.py
@@ -773,9 +773,9 @@ class RemoteExecutor(BaseExecutor):
# There's a race condition where someone else
# already finished the work and removed the source
# code file before we could copy it. No biggie.
- msg = f'{bundle}: Failed to send instructions to the worker machine... ' +
- 'We\'re a backup and this may be caused by the original (or some ' +
- 'other backup) already finishing this work. Ignoring this.'
+ msg = f'{bundle}: Failed to send instructions to the worker machine... '
+ msg += 'We\'re a backup and this may be caused by the original (or some '
+ msg += 'other backup) already finishing this work. Ignoring this.'
logger.warning(msg)
warnings.warn(msg)
return None
@@ -962,7 +962,7 @@ class RemoteExecutor(BaseExecutor):
def create_original_bundle(self, pickle, fname: str):
from string_utils import generate_uuid
- uuid = generate_uuid(as_hex=True)
+ uuid = generate_uuid(omit_dashes=True)
code_file = f'/tmp/{uuid}.code.bin'
result_file = f'/tmp/{uuid}.result.bin'
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index e4b48a0..5711b9a 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -139,6 +139,8 @@ if [ ${FAILURES} -ne 0 ]; then
fi
echo "${FAILED_TESTS}"
echo -e "${NC}"
+ exit ${FAILURES}
else
echo -e "${BLACK}${ON_GREEN}Everything looks good.${NC}"
+ exit 0
fi
--
2.49.0