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

Side by Side Diff: infra/services/gnumbd/test/gnumbd_smoketests.expected/branch_from_branch.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, 5 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 unified diff | Download patch

« infra/libs/git2/util.py ('K') | « infra/services/gnumbd/test/gnumbd_smoketests.expected/branch.yaml ('k') | infra/services/gnumbd/test/gnumbd_smoketests.expected/enforce_commit_timestamps.yaml » ('j') | test.py » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
	(Empty)
1 - - Branch 1 in place

2 - origin:

3 refs/branch-heads/cool_branch:

4 157f613ec89b70fcc2c142bd7b15d7ad98a08d86:

5 - Branch commit!

6 - ''

7 - 'Cr-Commit-Position: refs/branch-heads/cool_branch@{#1}'

8 - 'Cr-Branched-From: dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04-refs/heads /master@{#101}'

9 dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04:

10 - Hello world

11 - ''

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

13 9b00786942a531ae1510844f4ba3943cc4ca77fc:

14 - Base commit

15 - ''

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

17 refs/heads/master:

18 dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04:

19 - Hello world

20 - ''

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

22 9b00786942a531ae1510844f4ba3943cc4ca77fc:

23 - Base commit

24 - ''

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

26 refs/pending-config/main:

27 9c89763c0044528f8436434c820864c5e34ee1b6:

28 - update(['enabled_refglobs'])

29 caf49fa243a8fbdc11cb66bfbf745b578dc4d5b0:

30 - update(['interval', 'enabled_refglobs'])

31 refs/pending-tags/branch-heads/cool_branch:

32 04606a0a66f0a88f1199dd78c4fa3915906f4670:

33 - Branch commit!

34 dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04:

35 - Hello world

36 - ''

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

38 9b00786942a531ae1510844f4ba3943cc4ca77fc:

39 - Base commit

40 - ''

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

42 refs/pending-tags/heads/master:

43 4dac15f5702bf197eb2908203a87f43196d3789f:

44 - Hello world

45 9b00786942a531ae1510844f4ba3943cc4ca77fc:

46 - Base commit

47 - ''

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

49 refs/pending/branch-heads/cool_branch:

50 04606a0a66f0a88f1199dd78c4fa3915906f4670:

51 - Branch commit!

52 dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04:

53 - Hello world

54 - ''

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

56 9b00786942a531ae1510844f4ba3943cc4ca77fc:

57 - Base commit

58 - ''

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

60 refs/pending/heads/master:

61 4dac15f5702bf197eb2908203a87f43196d3789f:

62 - Hello world

63 9b00786942a531ae1510844f4ba3943cc4ca77fc:

64 - Base commit

65 - ''

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

67 - - New pending commit for branch

68 - origin:

69 refs/branch-heads/cool_branch:

70 157f613ec89b70fcc2c142bd7b15d7ad98a08d86:

71 - Branch commit!

72 - ''

73 - 'Cr-Commit-Position: refs/branch-heads/cool_branch@{#1}'

74 - 'Cr-Branched-From: dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04-refs/heads /master@{#101}'

75 dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04:

76 - Hello world

77 - ''

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

79 9b00786942a531ae1510844f4ba3943cc4ca77fc:

80 - Base commit

81 - ''

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

83 refs/branch-heads/cool_branch_yo:

84 157f613ec89b70fcc2c142bd7b15d7ad98a08d86:

85 - Branch commit!

86 - ''

87 - 'Cr-Commit-Position: refs/branch-heads/cool_branch@{#1}'

88 - 'Cr-Branched-From: dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04-refs/heads /master@{#101}'

89 dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04:

90 - Hello world

91 - ''

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

93 9b00786942a531ae1510844f4ba3943cc4ca77fc:

94 - Base commit

95 - ''

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

97 refs/heads/master:

98 dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04:

99 - Hello world

100 - ''

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

102 9b00786942a531ae1510844f4ba3943cc4ca77fc:

103 - Base commit

104 - ''

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

106 refs/pending-config/main:

107 9c89763c0044528f8436434c820864c5e34ee1b6:

108 - update(['enabled_refglobs'])

109 caf49fa243a8fbdc11cb66bfbf745b578dc4d5b0:

110 - update(['interval', 'enabled_refglobs'])

111 refs/pending-tags/branch-heads/cool_branch:

112 04606a0a66f0a88f1199dd78c4fa3915906f4670:

113 - Branch commit!

114 dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04:

115 - Hello world

116 - ''

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

118 9b00786942a531ae1510844f4ba3943cc4ca77fc:

119 - Base commit

120 - ''

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

122 refs/pending-tags/branch-heads/cool_branch_yo:

123 157f613ec89b70fcc2c142bd7b15d7ad98a08d86:

124 - Branch commit!

125 - ''

126 - 'Cr-Commit-Position: refs/branch-heads/cool_branch@{#1}'

127 - 'Cr-Branched-From: dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04-refs/heads /master@{#101}'

128 dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04:

129 - Hello world

130 - ''

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

132 9b00786942a531ae1510844f4ba3943cc4ca77fc:

133 - Base commit

134 - ''

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

136 refs/pending-tags/heads/master:

137 4dac15f5702bf197eb2908203a87f43196d3789f:

138 - Hello world

139 9b00786942a531ae1510844f4ba3943cc4ca77fc:

140 - Base commit

141 - ''

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

143 refs/pending/branch-heads/cool_branch:

144 04606a0a66f0a88f1199dd78c4fa3915906f4670:

145 - Branch commit!

146 dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04:

147 - Hello world

148 - ''

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

150 9b00786942a531ae1510844f4ba3943cc4ca77fc:

151 - Base commit

152 - ''

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

154 refs/pending/branch-heads/cool_branch_yo:

155 9212a87dfa78241acf65908f0f56bbb121471d77:

156 - Super branchey commit

157 157f613ec89b70fcc2c142bd7b15d7ad98a08d86:

158 - Branch commit!

159 - ''

160 - 'Cr-Commit-Position: refs/branch-heads/cool_branch@{#1}'

161 - 'Cr-Branched-From: dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04-refs/heads /master@{#101}'

162 dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04:

163 - Hello world

164 - ''

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

166 9b00786942a531ae1510844f4ba3943cc4ca77fc:

167 - Base commit

168 - ''

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

170 refs/pending/heads/master:

171 4dac15f5702bf197eb2908203a87f43196d3789f:

172 - Hello world

173 9b00786942a531ae1510844f4ba3943cc4ca77fc:

174 - Base commit

175 - ''

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

177 - log output:

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

179 - 'INFO: Ref(TestRepo(''local''), ''refs/heads/master'') is up to date'

180 - 'INFO: Processing Ref(TestRepo(''local''), ''refs/branch-heads/cool_branch'' )'

181 - 'INFO: Ref(TestRepo(''local''), ''refs/branch-heads/cool_branch'') is up to date'

182 - 'INFO: Processing Ref(TestRepo(''local''), ''refs/branch-heads/cool_branch_y o'')'

183 - 'INFO: Pushing synthesized commit ''f449095356acf5ebca83c5f125de03849596b137 ''

184 for ''9212a87dfa78241acf65908f0f56bbb121471d77'''

185 - - Second pending commit now on branch

186 - origin:

187 refs/branch-heads/cool_branch:

188 157f613ec89b70fcc2c142bd7b15d7ad98a08d86:

189 - Branch commit!

190 - ''

191 - 'Cr-Commit-Position: refs/branch-heads/cool_branch@{#1}'

192 - 'Cr-Branched-From: dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04-refs/heads /master@{#101}'

193 dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04:

194 - Hello world

195 - ''

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

197 9b00786942a531ae1510844f4ba3943cc4ca77fc:

198 - Base commit

199 - ''

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

201 refs/branch-heads/cool_branch_yo:

202 f449095356acf5ebca83c5f125de03849596b137:

203 - Super branchey commit

204 - ''

205 - 'Cr-Commit-Position: refs/branch-heads/cool_branch_yo@{#1}'

206 - 'Cr-Branched-From: 157f613ec89b70fcc2c142bd7b15d7ad98a08d86-refs/branc h-heads/cool_branch@{#1}'

207 - 'Cr-Branched-From: dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04-refs/heads /master@{#101}'

208 157f613ec89b70fcc2c142bd7b15d7ad98a08d86:

209 - Branch commit!

210 - ''

211 - 'Cr-Commit-Position: refs/branch-heads/cool_branch@{#1}'

212 - 'Cr-Branched-From: dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04-refs/heads /master@{#101}'

213 dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04:

214 - Hello world

215 - ''

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

217 9b00786942a531ae1510844f4ba3943cc4ca77fc:

218 - Base commit

219 - ''

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

221 refs/heads/master:

222 dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04:

223 - Hello world

224 - ''

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

226 9b00786942a531ae1510844f4ba3943cc4ca77fc:

227 - Base commit

228 - ''

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

230 refs/pending-config/main:

231 9c89763c0044528f8436434c820864c5e34ee1b6:

232 - update(['enabled_refglobs'])

233 caf49fa243a8fbdc11cb66bfbf745b578dc4d5b0:

234 - update(['interval', 'enabled_refglobs'])

235 refs/pending-tags/branch-heads/cool_branch:

236 04606a0a66f0a88f1199dd78c4fa3915906f4670:

237 - Branch commit!

238 dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04:

239 - Hello world

240 - ''

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

242 9b00786942a531ae1510844f4ba3943cc4ca77fc:

243 - Base commit

244 - ''

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

246 refs/pending-tags/branch-heads/cool_branch_yo:

247 9212a87dfa78241acf65908f0f56bbb121471d77:

248 - Super branchey commit

249 157f613ec89b70fcc2c142bd7b15d7ad98a08d86:

250 - Branch commit!

251 - ''

252 - 'Cr-Commit-Position: refs/branch-heads/cool_branch@{#1}'

253 - 'Cr-Branched-From: dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04-refs/heads /master@{#101}'

254 dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04:

255 - Hello world

256 - ''

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

258 9b00786942a531ae1510844f4ba3943cc4ca77fc:

259 - Base commit

260 - ''

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

262 refs/pending-tags/heads/master:

263 4dac15f5702bf197eb2908203a87f43196d3789f:

264 - Hello world

265 9b00786942a531ae1510844f4ba3943cc4ca77fc:

266 - Base commit

267 - ''

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

269 refs/pending/branch-heads/cool_branch:

270 04606a0a66f0a88f1199dd78c4fa3915906f4670:

271 - Branch commit!

272 dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04:

273 - Hello world

274 - ''

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

276 9b00786942a531ae1510844f4ba3943cc4ca77fc:

277 - Base commit

278 - ''

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

280 refs/pending/branch-heads/cool_branch_yo:

281 9212a87dfa78241acf65908f0f56bbb121471d77:

282 - Super branchey commit

283 157f613ec89b70fcc2c142bd7b15d7ad98a08d86:

284 - Branch commit!

285 - ''

286 - 'Cr-Commit-Position: refs/branch-heads/cool_branch@{#1}'

287 - 'Cr-Branched-From: dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04-refs/heads /master@{#101}'

288 dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04:

289 - Hello world

290 - ''

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

292 9b00786942a531ae1510844f4ba3943cc4ca77fc:

293 - Base commit

294 - ''

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

296 refs/pending/heads/master:

297 4dac15f5702bf197eb2908203a87f43196d3789f:

298 - Hello world

299 9b00786942a531ae1510844f4ba3943cc4ca77fc:

300 - Base commit

301 - ''

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

OLD	NEW