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

Unified Diff: infra/services/gnumbd/test/gnumbd_smoketests.expected/manual_merge_commits_ok.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/incoming_svn_id_drops.yaml ('k') | infra/services/gnumbd/test/gnumbd_smoketests.expected/master_ahead.yaml » ('j') | test.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

deleted file mode 100644

index 21367cb21df9d21bed75610e9de9c4329576f493..0000000000000000000000000000000000000000

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

+++ /dev/null

@@ -1,106 +0,0 @@

-- - The setup.

- - origin:

- refs/heads/master:

- 6a6a537d5a9e56978c2cca0dcd550383e563e615:

- - Two for one!

- - ''

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

- 497a51ee3c7cc6826aeca9070a4be56011f8e5f6:

- - Incoming merge!

- - ''

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

- 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:

- 6a6a537d5a9e56978c2cca0dcd550383e563e615:

- - Two for one!

- - ''

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

- 497a51ee3c7cc6826aeca9070a4be56011f8e5f6:

- - Incoming merge!

- - ''

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

- f493b56e446fb46797fa09bbf5888790acb039f2:

- - Base commit

- - ''

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

- refs/pending/heads/master:

- 05726084aa3e3caa3127e29b323a14c7b81a5367:

- - Hello world

- 6a6a537d5a9e56978c2cca0dcd550383e563e615:

- - Two for one!

- - ''

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

- 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'')'

- - 'INFO: Pushing synthesized commit ''174544952b2988883002f0d6d28bf31c76f3a6de''

- for ''05726084aa3e3caa3127e29b323a14c7b81a5367'''

-- - Hello world landed w/o a hitch

- - origin:

- refs/heads/master:

- 174544952b2988883002f0d6d28bf31c76f3a6de:

- - Hello world

- - ''

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

- 6a6a537d5a9e56978c2cca0dcd550383e563e615:

- - Two for one!

- - ''

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

- 497a51ee3c7cc6826aeca9070a4be56011f8e5f6:

- - Incoming merge!

- - ''

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

- 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:

- 05726084aa3e3caa3127e29b323a14c7b81a5367:

- - Hello world

- 6a6a537d5a9e56978c2cca0dcd550383e563e615:

- - Two for one!

- - ''

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

- 497a51ee3c7cc6826aeca9070a4be56011f8e5f6:

- - Incoming merge!

- - ''

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

- f493b56e446fb46797fa09bbf5888790acb039f2:

- - Base commit

- - ''

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

- refs/pending/heads/master:

- 05726084aa3e3caa3127e29b323a14c7b81a5367:

- - Hello world

- 6a6a537d5a9e56978c2cca0dcd550383e563e615:

- - Two for one!

- - ''

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

- 497a51ee3c7cc6826aeca9070a4be56011f8e5f6:

- - Incoming merge!

- - ''

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

- f493b56e446fb46797fa09bbf5888790acb039f2:

- - Base commit

- - ''

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