From 13288c69988380210150124d7991af6ca6e3d62b Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Sun, 28 Jan 2018 22:32:08 -0500 Subject: [PATCH] 12199: Make mocks match real slurm output. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- services/nodemanager/tests/test_jobqueue.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/nodemanager/tests/test_jobqueue.py b/services/nodemanager/tests/test_jobqueue.py index a64fb23026..52232453bd 100644 --- a/services/nodemanager/tests/test_jobqueue.py +++ b/services/nodemanager/tests/test_jobqueue.py @@ -181,8 +181,8 @@ class JobQueueMonitorActorTestCase(testutil.RemotePollLoopActorTestMixin, @mock.patch("subprocess.check_output") def test_squeue_server_list(self, mock_squeue): - mock_squeue.return_value = """1|1024|0|(Resources)|zzzzz-dz642-zzzzzzzzzzzzzzy| -2|1024|0|(Resources)|zzzzz-dz642-zzzzzzzzzzzzzzz| + mock_squeue.return_value = """1|1024|0|(Resources)|zzzzz-dz642-zzzzzzzzzzzzzzy|(null) +2|1024|0|(Resources)|zzzzz-dz642-zzzzzzzzzzzzzzz|(null) """ super(JobQueueMonitorActorTestCase, self).build_monitor(jobqueue.ServerCalculator( @@ -195,8 +195,8 @@ class JobQueueMonitorActorTestCase(testutil.RemotePollLoopActorTestMixin, @mock.patch("subprocess.check_output") def test_squeue_server_list_suffix(self, mock_squeue): - mock_squeue.return_value = """1|1024M|0|(ReqNodeNotAvail, UnavailableNodes:compute123)|zzzzz-dz642-zzzzzzzzzzzzzzy| -1|2G|0|(ReqNodeNotAvail)|zzzzz-dz642-zzzzzzzzzzzzzzz| + mock_squeue.return_value = """1|1024M|0|(ReqNodeNotAvail, UnavailableNodes:compute123)|zzzzz-dz642-zzzzzzzzzzzzzzy|(null) +1|2G|0|(ReqNodeNotAvail)|zzzzz-dz642-zzzzzzzzzzzzzzz|(null) """ super(JobQueueMonitorActorTestCase, self).build_monitor(jobqueue.ServerCalculator( -- 2.30.2