projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
12447: Simplify BlockCache locking.
[arvados.git]
/
services
/
nodemanager
/
tests
/
integration_test.py
diff --git
a/services/nodemanager/tests/integration_test.py
b/services/nodemanager/tests/integration_test.py
index c4565fdbaf7291ac2f46f48a2c4e629b9e63989a..d5b55540f8e66eea3749d1828d3203ae89521f92 100755
(executable)
--- a/
services/nodemanager/tests/integration_test.py
+++ b/
services/nodemanager/tests/integration_test.py
@@
-40,7
+40,7
@@
detail.addHandler(logging.StreamHandler(detail_content))
fake_slurm = None
compute_nodes = None
all_jobs = None
fake_slurm = None
compute_nodes = None
all_jobs = None
-unsatisfiable_job_scancelled =
os.path.join(tempfile.mkdtemp(), "scancel_called")
+unsatisfiable_job_scancelled =
None
def update_script(path, val):
with open(path+"_", "w") as f:
def update_script(path, val):
with open(path+"_", "w") as f:
@@
-143,6
+143,9
@@
def expect_count(count, checks, pattern, g):
def run_test(name, actions, checks, driver_class, jobs, provider):
code = 0
def run_test(name, actions, checks, driver_class, jobs, provider):
code = 0
+ global unsatisfiable_job_scancelled
+ unsatisfiable_job_scancelled = os.path.join(tempfile.mkdtemp(),
+ "scancel_called")
# Delete any stale node records
api = arvados.api('v1')
# Delete any stale node records
api = arvados.api('v1')
@@
-385,6
+388,7
@@
def main():
[
(r".*Daemon started", set_squeue),
(r".*Rate limit exceeded - scheduling retry in 12 seconds", noop),
[
(r".*Daemon started", set_squeue),
(r".*Rate limit exceeded - scheduling retry in 12 seconds", noop),
+ (r".*Rate limit exceeded - scheduling retry in 2 seconds", noop),
(r".*Cloud node (\S+) is now paired with Arvados node (\S+) with hostname (\S+)", noop),
],
{},
(r".*Cloud node (\S+) is now paired with Arvados node (\S+) with hostname (\S+)", noop),
],
{},