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

Merge branch 'fix-pipeline-metrics-failure' into 'master'
77507df6 · Douwe Maan · d2591df1 · 009da2fc · 77507df6
Commit 77507df6 authored Oct 17, 2016 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

pipeline_metrics_worker_spec.rb spec/workers/pipeline_metrics_worker_spec.rb +2 -2

No files found.
--- a/spec/workers/pipeline_metrics_worker_spec.rb
+++ b/spec/workers/pipeline_metrics_worker_spec.rb
@@ -23,7 +23,7 @@ describe PipelineMetricsWorker do
      it 'records the build start time' do
        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

      it 'clears the build end time' do
@@ -39,7 +39,7 @@ describe PipelineMetricsWorker do
      it 'records the build end time' do
        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