infra/services/gnumbd/test/gnumbd_smoketests.expected/merge_commits_fail.yaml - Issue 355153002: Refactor infra git libs and testing.

Unified Diff: infra/services/gnumbd/test/gnumbd_smoketests.expected/merge_commits_fail.yaml

Issue 355153002: Refactor infra git libs and testing. (Closed) Base URL: https://chromium.googlesource.com/infra/infra@fake_testing_support

Patch Set: Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« infra/libs/git2/util.py ('K') | « infra/services/gnumbd/test/gnumbd_smoketests.expected/master_tag_ahead_pending.yaml ('k') | infra/services/gnumbd/test/gnumbd_smoketests.expected/multi_pending.yaml » ('j') | test.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: infra/services/gnumbd/test/gnumbd_smoketests.expected/merge_commits_fail.yaml

diff --git a/infra/services/gnumbd/test/gnumbd_smoketests.expected/merge_commits_fail.yaml b/infra/services/gnumbd/test/gnumbd_smoketests.expected/merge_commits_fail.yaml

deleted file mode 100644

index 87e7cdcec396a505a8f1b3dff457bcf2dd9aaeea..0000000000000000000000000000000000000000

--- a/infra/services/gnumbd/test/gnumbd_smoketests.expected/merge_commits_fail.yaml

+++ /dev/null

@@ -1,67 +0,0 @@

-- - The setup.

- - origin:

- refs/heads/master:

- f493b56e446fb46797fa09bbf5888790acb039f2:

- - Base commit

- - ''

- - 'Cr-Commit-Position: refs/heads/master@{#100}'

- refs/heads/other:

- 497a51ee3c7cc6826aeca9070a4be56011f8e5f6:

- - Incoming merge!

- - ''

- - 'Cr-Commit-Position: refs/heads/other@{#20}'

- refs/pending-tags/heads/master:

- f493b56e446fb46797fa09bbf5888790acb039f2:

- - Base commit

- - ''

- - 'Cr-Commit-Position: refs/heads/master@{#100}'

- refs/pending/heads/master:

- aeedb7388bbeb9d10cf8a2f3aceeb32984b07624:

- - Hello world

- 38b859f0a917740e3f427a6aa7d3322ff3934693:

- - Two for one!

- 497a51ee3c7cc6826aeca9070a4be56011f8e5f6:

- - Incoming merge!

- - ''

- - 'Cr-Commit-Position: refs/heads/other@{#20}'

- f493b56e446fb46797fa09bbf5888790acb039f2:

- - Base commit

- - ''

- - 'Cr-Commit-Position: refs/heads/master@{#100}'

-- log output:

- - 'INFO: Processing Ref(TestRepo(''local''), ''refs/heads/master'')'

- - 'WARNING: Skipping already-processed commit on real_ref Ref(TestRepo(''local''),

- ''refs/heads/master''): ''497a51ee3c7cc6826aeca9070a4be56011f8e5f6'''

- - 'ERROR: Commit ''38b859f0a917740e3f427a6aa7d3322ff3934693'' has more than one

- parent!'

- - 'ERROR: Cannot process pending merge commit Commit(TestRepo(''local''), ''38b859f0a917740e3f427a6aa7d3322ff3934693'')'

-- - Should be the same

- - origin:

- refs/heads/master:

- f493b56e446fb46797fa09bbf5888790acb039f2:

- - Base commit

- - ''

- - 'Cr-Commit-Position: refs/heads/master@{#100}'

- refs/heads/other:

- 497a51ee3c7cc6826aeca9070a4be56011f8e5f6:

- - Incoming merge!

- - ''

- - 'Cr-Commit-Position: refs/heads/other@{#20}'

- refs/pending-tags/heads/master:

- f493b56e446fb46797fa09bbf5888790acb039f2:

- - Base commit

- - ''

- - 'Cr-Commit-Position: refs/heads/master@{#100}'

- refs/pending/heads/master:

- aeedb7388bbeb9d10cf8a2f3aceeb32984b07624:

- - Hello world

- 38b859f0a917740e3f427a6aa7d3322ff3934693:

- - Two for one!

- 497a51ee3c7cc6826aeca9070a4be56011f8e5f6:

- - Incoming merge!

- - ''

- - 'Cr-Commit-Position: refs/heads/other@{#20}'

- f493b56e446fb46797fa09bbf5888790acb039f2:

- - Base commit

- - ''

- - 'Cr-Commit-Position: refs/heads/master@{#100}'