Skip to content

Commit

Permalink
Merge pull request #15301 from imtayadeway/bug/fix-interacting-time-t…
Browse files Browse the repository at this point in the history
…ests

Put time back the way we found it
(cherry picked from commit 0debdf0)
  • Loading branch information
isimluk authored and simaishi committed Jun 12, 2017
1 parent 1820f3c commit 94a08e5
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions spec/models/job_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,8 @@
@queue_item = MiqQueue.put(:task_id => @job.guid)
end

after { Timecop.return }

context "job timed out" do
it "calls 'job#timeout!' if server was not assigned to job" do
Timecop.travel 5.minutes
Expand Down

0 comments on commit 94a08e5

Please sign in to comment.