Commit ce641335 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Introduce Gitlab::Utils.now so that it's easier to stub

parent 0ea81ae5
...@@ -48,11 +48,11 @@ module Ci ...@@ -48,11 +48,11 @@ module Ci
end end
before_transition [:created, :pending] => :running do |pipeline| before_transition [:created, :pending] => :running do |pipeline|
pipeline.started_at = Time.now pipeline.started_at = Gitlab::Utils.now
end end
before_transition any => [:success, :failed, :canceled] do |pipeline| before_transition any => [:success, :failed, :canceled] do |pipeline|
pipeline.finished_at = Time.now pipeline.finished_at = Gitlab::Utils.now
end end
before_transition do |pipeline| before_transition do |pipeline|
......
...@@ -87,7 +87,7 @@ module Statuseable ...@@ -87,7 +87,7 @@ module Statuseable
if started_at && finished_at if started_at && finished_at
finished_at - started_at finished_at - started_at
elsif started_at elsif started_at
Time.now - started_at Gitlab::Utils.now - started_at
end end
end end
end end
...@@ -7,11 +7,16 @@ module Gitlab ...@@ -7,11 +7,16 @@ module Gitlab
# @param cmd [Array<String>] # @param cmd [Array<String>]
# @return [Boolean] # @return [Boolean]
def system_silent(cmd) def system_silent(cmd)
Popen::popen(cmd).last.zero? Popen.popen(cmd).last.zero?
end end
def force_utf8(str) def force_utf8(str)
str.force_encoding(Encoding::UTF_8) str.force_encoding(Encoding::UTF_8)
end end
# The same as Time.now but using this would make it easier to test
def now
Time.now
end
end end
end end
...@@ -129,12 +129,15 @@ describe Ci::Pipeline, models: true do ...@@ -129,12 +129,15 @@ describe Ci::Pipeline, models: true do
describe '#duration' do describe '#duration' do
before do before do
build.skip allow(Gitlab::Utils).to receive(:now).
build2.skip and_return(current - 120, current)
pipeline.run
pipeline.succeed
end end
it 'matches sum of builds duration' do it 'matches sum of builds duration' do
expect(pipeline.reload.duration).to eq(build.duration + build2.duration) expect(pipeline.reload.duration).to eq(120)
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment