Commit 912613c4 authored by Michael Kozono's avatar Michael Kozono

Reduce 28 test runs to 4

14 to 2, but these shared examples are used twice. This was already done in another context further down the file.
parent 53c409cb
...@@ -103,30 +103,34 @@ describe Gitlab::HealthChecks::FsShardsCheck do ...@@ -103,30 +103,34 @@ describe Gitlab::HealthChecks::FsShardsCheck do
example.run_with_retry retry: times_to_try example.run_with_retry retry: times_to_try
end end
it { is_expected.to all(have_attributes(labels: { shard: :default })) } it 'provides metrics' do
expect(subject).to all(have_attributes(labels: { shard: :default }))
it { is_expected.to include(an_object_having_attributes(name: :filesystem_accessible, value: 0)) } expect(subject).to include(an_object_having_attributes(name: :filesystem_accessible, value: 0))
it { is_expected.to include(an_object_having_attributes(name: :filesystem_readable, value: 0)) } expect(subject).to include(an_object_having_attributes(name: :filesystem_readable, value: 0))
it { is_expected.to include(an_object_having_attributes(name: :filesystem_writable, value: 0)) } expect(subject).to include(an_object_having_attributes(name: :filesystem_writable, value: 0))
it { is_expected.to include(an_object_having_attributes(name: :filesystem_access_latency, value: be >= 0)) } expect(subject).to include(an_object_having_attributes(name: :filesystem_access_latency, value: be >= 0))
it { is_expected.to include(an_object_having_attributes(name: :filesystem_read_latency, value: be >= 0)) } expect(subject).to include(an_object_having_attributes(name: :filesystem_read_latency, value: be >= 0))
it { is_expected.to include(an_object_having_attributes(name: :filesystem_write_latency, value: be >= 0)) } expect(subject).to include(an_object_having_attributes(name: :filesystem_write_latency, value: be >= 0))
end
end end
context 'storage points to directory that has both read and write rights' do context 'storage points to directory that has both read and write rights' do
before do before do
FileUtils.chmod_R(0755, tmp_dir) FileUtils.chmod_R(0755, tmp_dir)
end end
it { is_expected.to all(have_attributes(labels: { shard: :default })) }
it { is_expected.to include(an_object_having_attributes(name: :filesystem_accessible, value: 1)) } it 'provides metrics' do
it { is_expected.to include(an_object_having_attributes(name: :filesystem_readable, value: 1)) } expect(subject).to all(have_attributes(labels: { shard: :default }))
it { is_expected.to include(an_object_having_attributes(name: :filesystem_writable, value: 1)) }
it { is_expected.to include(an_object_having_attributes(name: :filesystem_access_latency, value: be >= 0)) } expect(subject).to include(an_object_having_attributes(name: :filesystem_accessible, value: 1))
it { is_expected.to include(an_object_having_attributes(name: :filesystem_read_latency, value: be >= 0)) } expect(subject).to include(an_object_having_attributes(name: :filesystem_readable, value: 1))
it { is_expected.to include(an_object_having_attributes(name: :filesystem_write_latency, value: be >= 0)) } expect(subject).to include(an_object_having_attributes(name: :filesystem_writable, value: 1))
expect(subject).to include(an_object_having_attributes(name: :filesystem_access_latency, value: be >= 0))
expect(subject).to include(an_object_having_attributes(name: :filesystem_read_latency, value: be >= 0))
expect(subject).to include(an_object_having_attributes(name: :filesystem_write_latency, value: be >= 0))
end
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