Commit 77507df6 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'fix-pipeline-metrics-failure' into 'master'

Fix broken specs on MySQL

## What does this MR do?
Fixes broken master after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6896

See merge request !6935
parents d2591df1 009da2fc
...@@ -23,7 +23,7 @@ describe PipelineMetricsWorker do ...@@ -23,7 +23,7 @@ describe PipelineMetricsWorker do
it 'records the build start time' do it 'records the build start time' do
subject subject
expect(merge_request.reload.metrics.latest_build_started_at).to eq(pipeline.started_at) expect(merge_request.reload.metrics.latest_build_started_at).to be_within(1.second).of(pipeline.started_at)
end end
it 'clears the build end time' do it 'clears the build end time' do
...@@ -39,7 +39,7 @@ describe PipelineMetricsWorker do ...@@ -39,7 +39,7 @@ describe PipelineMetricsWorker do
it 'records the build end time' do it 'records the build end time' do
subject subject
expect(merge_request.reload.metrics.latest_build_finished_at).to eq(pipeline.finished_at) expect(merge_request.reload.metrics.latest_build_finished_at).to be_within(1.second).of(pipeline.finished_at)
end end
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