projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '12414-delete-trashed-project-contents'
[arvados.git]
/
services
/
api
/
test
/
unit
/
crunch_dispatch_test.rb
diff --git
a/services/api/test/unit/crunch_dispatch_test.rb
b/services/api/test/unit/crunch_dispatch_test.rb
index 4646f7afd151c1b6a0467521f2ff08841791c199..3460abe3cc6c50ac4e2f1a40fbbe2acb22350c0b 100644
(file)
--- a/
services/api/test/unit/crunch_dispatch_test.rb
+++ b/
services/api/test/unit/crunch_dispatch_test.rb
@@
-1,3
+1,7
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
require 'test_helper'
require 'crunch_dispatch'
require 'helpers/git_test_helper'
require 'test_helper'
require 'crunch_dispatch'
require 'helpers/git_test_helper'
@@
-208,14
+212,14
@@
class CrunchDispatchTest < ActiveSupport::TestCase
act_as_system_user do
dispatch = CrunchDispatch.new
act_as_system_user do
dispatch = CrunchDispatch.new
- squeue_resp =
File.popen("echo zzzzz-8i9sb-pshmckwoma9plh7\necho thisisnotvalidjobuuid\necho zzzzz-8i9sb-4cf0abc123e809j
\n")
- scancel_resp =
File
.popen("true")
+ squeue_resp =
IO.popen("echo zzzzz-8i9sb-pshmckwoma9plh7\necho thisisnotvalidjobuuid\necho zzzzz-8i9sb-4cf0abc123e809j\necho zzzzz-dz642-o04e3r651turtdr
\n")
+ scancel_resp =
IO
.popen("true")
-
File
.expects(:popen).
+
IO
.expects(:popen).
with(['squeue', '-a', '-h', '-o', '%j']).
returns(squeue_resp)
with(['squeue', '-a', '-h', '-o', '%j']).
returns(squeue_resp)
-
File
.expects(:popen).
+
IO
.expects(:popen).
with(dispatch.sudo_preface + ['scancel', '-n', 'zzzzz-8i9sb-4cf0abc123e809j']).
returns(scancel_resp)
with(dispatch.sudo_preface + ['scancel', '-n', 'zzzzz-8i9sb-4cf0abc123e809j']).
returns(scancel_resp)