Commit 23063297 authored by Nick Thomas's avatar Nick Thomas

Merge branch 'rails5-checksum' into 'master'

[Rails5] Use hexadecimal checksum

Closes #6744

See merge request gitlab-org/gitlab-ee!6768
parents fefd66de 2ab01aa7
...@@ -33,8 +33,8 @@ describe Geo::RepositoryVerificationSecondaryService, :geo do ...@@ -33,8 +33,8 @@ describe Geo::RepositoryVerificationSecondaryService, :geo do
end end
it 'does not verify the checksum if the current checksum matches' do it 'does not verify the checksum if the current checksum matches' do
repository_state.assign_attributes("#{type}_verification_checksum" => 'my_checksum') repository_state.assign_attributes("#{type}_verification_checksum" => '62fc1ec4ce60')
registry.assign_attributes("#{type}_verification_checksum_sha" => 'my_checksum') registry.assign_attributes("#{type}_verification_checksum_sha" => '62fc1ec4ce60')
expect(repository).not_to receive(:checksum) expect(repository).not_to receive(:checksum)
...@@ -42,12 +42,12 @@ describe Geo::RepositoryVerificationSecondaryService, :geo do ...@@ -42,12 +42,12 @@ describe Geo::RepositoryVerificationSecondaryService, :geo do
end end
it 'sets checksum when the checksum matches' do it 'sets checksum when the checksum matches' do
allow(repository).to receive(:checksum).and_return('my_checksum') allow(repository).to receive(:checksum).and_return('62fc1ec4ce60')
service.execute service.execute
expect(registry).to have_attributes( expect(registry).to have_attributes(
"#{type}_verification_checksum_sha" => 'my_checksum', "#{type}_verification_checksum_sha" => '62fc1ec4ce60',
"#{type}_checksum_mismatch" => false, "#{type}_checksum_mismatch" => false,
"last_#{type}_verification_failure" => nil, "last_#{type}_verification_failure" => nil,
"#{type}_verification_retry_count" => nil, "#{type}_verification_retry_count" => nil,
...@@ -155,7 +155,7 @@ describe Geo::RepositoryVerificationSecondaryService, :geo do ...@@ -155,7 +155,7 @@ describe Geo::RepositoryVerificationSecondaryService, :geo do
describe '#execute' do describe '#execute' do
let(:project) { create(:project, :repository, :wiki_repo) } let(:project) { create(:project, :repository, :wiki_repo) }
let!(:repository_state) { create(:repository_state, project: project, repository_verification_checksum: 'my_checksum', wiki_verification_checksum: 'my_checksum') } let!(:repository_state) { create(:repository_state, project: project, repository_verification_checksum: '62fc1ec4ce60', wiki_verification_checksum: '62fc1ec4ce60') }
let(:registry) { create(:geo_project_registry, :synced, project: project) } let(:registry) { create(:geo_project_registry, :synced, project: project) }
context 'for a repository' do context 'for a repository' do
......
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