Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test: fix ambiguous OID prefix canonical name test cases #313

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

test: fix ambiguous OID prefix canonical name test cases #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5cb0351
test: improve failure message for ambiguous commits
cpb Sep 25, 2024
5a20a95
text: fix failing Evgeny Zislis test
cpb Sep 25, 2024
d0f4ea0
test: fix failing Jeff Berg test
cpb Sep 25, 2024
9e0dc21
Shorten SHA length to resolve ambiguous OID
cpb Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/credits/canonical_names_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1460,7 +1460,7 @@ class CanonicalNamesTest < ActiveSupport::TestCase
end

test "evgeny.zislis\100gmail.com" do
assert_contributor_names '842ce34', 'Evgeny Zislis'
assert_contributor_names '842ce34b', 'Evgeny Zislis'
end

test 'f.svehla' do
Expand Down Expand Up @@ -2064,7 +2064,7 @@ class CanonicalNamesTest < ActiveSupport::TestCase
end

test "jeff\100ministrycentered.com" do
assert_contributor_names 'a5991d8', 'Jeff Berg'
assert_contributor_names 'a5991d84', 'Jeff Berg'
end

test "jeff\100opendbms.com" do
Expand Down
6 changes: 5 additions & 1 deletion test/support/assert_contributor_names.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ module AssertContributorNames
def assert_contributor_names(sha1, *contributor_names, **options)
begin
commit = Commit.new_from_rugged_commit(REPO.repo.lookup(sha1))
rescue Rugged::OdbError
rescue Rugged::OdbError => e
if e.message == "ambiguous OID prefix - found multiple pack entries"
raise "#{sha1} is ambiguous, please use the full commit SHA"
end

raise "#{sha1} was not found, please make sure the local Rails checkout is up to date"
end

Expand Down
Loading