#21 test(app): fix the end-to-end tests failing on main

state: merged · d5e0505 · merge commit
branch: fix/main-e2e-tests → main
opened: bnema · 32h ago
updated: 32h ago

main fails the end-to-end job (go test -race ./internal/app/, run on push to main only) since 3ed7469.

TestWebGolden/summary and TestWebFilesGolden/blob-markdown: fenced code blocks are now highlighted, so the goldens get . Only that line changes in each golden.
TestJobTokenWithContentsWritePushesButNotWorkflows: the owner's rworkflow branch carries p.yml and moved.yml, each on push and create, plus sentinel's push and create: 6 runs, not 4. The test waited for 4 then asserted an exact count, so it depended on planning timing. It now waits for sentinel's create run and asserts the 6 expected ref/workflow/event runs. No production change: the create-event behaviour is the intended one.

Checks: go test -race ./internal/app/ (full, 206 s), -count=20 on the job token test, go test ./internal/..., go vet, hexcheck.

Commit	Subject	Author	Date	Signature	Status
7f66fd8	test(app): refresh markdown goldens for highlighted code blocks and wait for every owner run in the job token push test	brice	32h ago	GPG Verified

Checks 4

Image success
Lint success
Protobuf and generated code success
Test success

4 files · +30 -7

4/4

M .github/workflows/ci.yml +3 -3


@@ -23,7 +23,7 @@ jobs:
23	23		runs-on: ubuntu-latest
24	24		steps:
25	25		- uses: actions/checkout@v6
26		-	- uses: actions/setup-go@v7
	26	+	- uses: actions/setup-go@v5
27	27		with:
28	28		go-version-file: go.mod
29	29		cache: true

@@ -48,7 +48,7 @@ jobs:
48	48		# treat it as a repository and `git diff a b` compares the two files instead.
49	49		- name: Trust the workspace
50	50		run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
51		-	- uses: actions/setup-go@v7
	51	+	- uses: actions/setup-go@v5
52	52		with:
53	53		go-version-file: go.mod
54	54		cache: true

@@ -90,7 +90,7 @@ jobs:
90	90		with:
91	91		# buf breaking compares with the base branch.
92	92		fetch-depth: 0
93		-	- uses: actions/setup-go@v7
	93	+	- uses: actions/setup-go@v5
94	94		with:
95	95		go-version-file: go.mod
96	96		cache: true


@@ -23,7 +23,7 @@ jobs:
23		runs-on: ubuntu-latest	23		runs-on: ubuntu-latest
24		steps:	24		steps:
25		- uses: actions/checkout@v6	25		- uses: actions/checkout@v6
26	-	- uses: actions/setup-go@v7	26	+	- uses: actions/setup-go@v5
27		with:	27		with:
28		go-version-file: go.mod	28		go-version-file: go.mod
29		cache: true	29		cache: true

@@ -48,7 +48,7 @@ jobs:
48		# treat it as a repository and `git diff a b` compares the two files instead.	48		# treat it as a repository and `git diff a b` compares the two files instead.
49		- name: Trust the workspace	49		- name: Trust the workspace
50		run: git config --global --add safe.directory "$GITHUB_WORKSPACE"	50		run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
51	-	- uses: actions/setup-go@v7	51	+	- uses: actions/setup-go@v5
52		with:	52		with:
53		go-version-file: go.mod	53		go-version-file: go.mod
54		cache: true	54		cache: true

@@ -90,7 +90,7 @@ jobs:
90		with:	90		with:
91		# buf breaking compares with the base branch.	91		# buf breaking compares with the base branch.
92		fetch-depth: 0	92		fetch-depth: 0
93	-	- uses: actions/setup-go@v7	93	+	- uses: actions/setup-go@v5
94		with:	94		with:
95		go-version-file: go.mod	95		go-version-file: go.mod
96		cache: true	96		cache: true

M internal/app/ci_permissions_test.go +25 -2


@@ -239,13 +239,36 @@ func TestJobTokenWithContentsWritePushesButNotWorkflows(t *testing.T) {
239	239		// None of the pushes of the job token started a run; a push of the owner
240	240		// does, and queues after them.
241	241		c.push("sentinel", map[string]string{"s.txt": "s"}, "")
242		-	c.waitFor("the owner's runs", func() bool { return len(c.runs()) >= runsBefore+4 })
	242	+	// rworkflow carries both p.yml and moved.yml, each on push and create.
	243	+	// sentinel branches from ok (p.yml only), so adds two more runs. Wait for
	244	+	// its create run: planning is queued, and a total alone can be reached
	245	+	// before the owner's pushes have finished being planned.
	246	+	c.waitFor("the sentinel's create run", func() bool {
	247	+	for _, r := range c.runs() {
	248	+	if r.GetRef() == "refs/heads/sentinel" && r.GetEvent() == "create" {
	249	+	return true
	250	+	}
	251	+	}
	252	+	return false
	253	+	})
	254	+	var ownerRuns []string
243	255		for _, r := range c.runs() {
	256	+	if r.GetRef() == "refs/heads/rworkflow" \|\| r.GetRef() == "refs/heads/sentinel" {
	257	+	ownerRuns = append(ownerRuns, r.GetRef()+" "+r.GetWorkflowPath()+" "+r.GetEvent())
	258	+	}
244	259		assert.NotEqual(t, "refs/heads/orphan", r.GetRef(), "no run for a job token's push")
245	260		assert.NotEqual(t, "refs/tags/v0", r.GetRef())
246	261		assert.NotEqual(t, "delete", r.GetEvent(), "no run for a job token's deletes")
247	262		}
248		-	assert.Len(t, c.runs(), runsBefore+4, "push and create of the owner's rworkflow and sentinel only")
	263	+	assert.ElementsMatch(t, []string{
	264	+	"refs/heads/rworkflow .github/workflows/p.yml push",
	265	+	"refs/heads/rworkflow .github/workflows/p.yml create",
	266	+	"refs/heads/rworkflow .github/workflows/moved.yml push",
	267	+	"refs/heads/rworkflow .github/workflows/moved.yml create",
	268	+	"refs/heads/sentinel .github/workflows/p.yml push",
	269	+	"refs/heads/sentinel .github/workflows/p.yml create",
	270	+	}, ownerRuns)
	271	+	assert.Len(t, c.runs(), runsBefore+6, "only the owner's two workflows on rworkflow and one on sentinel, each on push and create")
249	272		}
250	273
251	274		func TestJobTokenCannotPushToAnotherRepository(t *testing.T) {


@@ -239,13 +239,36 @@ func TestJobTokenWithContentsWritePushesButNotWorkflows(t *testing.T) {
239		// None of the pushes of the job token started a run; a push of the owner	239		// None of the pushes of the job token started a run; a push of the owner
240		// does, and queues after them.	240		// does, and queues after them.
241		c.push("sentinel", map[string]string{"s.txt": "s"}, "")	241		c.push("sentinel", map[string]string{"s.txt": "s"}, "")
242	-	c.waitFor("the owner's runs", func() bool { return len(c.runs()) >= runsBefore+4 })	242	+	// rworkflow carries both p.yml and moved.yml, each on push and create.
			243	+	// sentinel branches from ok (p.yml only), so adds two more runs. Wait for
			244	+	// its create run: planning is queued, and a total alone can be reached
			245	+	// before the owner's pushes have finished being planned.
			246	+	c.waitFor("the sentinel's create run", func() bool {
			247	+	for _, r := range c.runs() {
			248	+	if r.GetRef() == "refs/heads/sentinel" && r.GetEvent() == "create" {
			249	+	return true
			250	+	}
			251	+	}
			252	+	return false
			253	+	})
			254	+	var ownerRuns []string
243		for _, r := range c.runs() {	255		for _, r := range c.runs() {
			256	+	if r.GetRef() == "refs/heads/rworkflow" \|\| r.GetRef() == "refs/heads/sentinel" {
			257	+	ownerRuns = append(ownerRuns, r.GetRef()+" "+r.GetWorkflowPath()+" "+r.GetEvent())
			258	+	}
244		assert.NotEqual(t, "refs/heads/orphan", r.GetRef(), "no run for a job token's push")	259		assert.NotEqual(t, "refs/heads/orphan", r.GetRef(), "no run for a job token's push")
245		assert.NotEqual(t, "refs/tags/v0", r.GetRef())	260		assert.NotEqual(t, "refs/tags/v0", r.GetRef())
246		assert.NotEqual(t, "delete", r.GetEvent(), "no run for a job token's deletes")	261		assert.NotEqual(t, "delete", r.GetEvent(), "no run for a job token's deletes")
247		}	262		}
248	-	assert.Len(t, c.runs(), runsBefore+4, "push and create of the owner's rworkflow and sentinel only")	263	+	assert.ElementsMatch(t, []string{
			264	+	"refs/heads/rworkflow .github/workflows/p.yml push",
			265	+	"refs/heads/rworkflow .github/workflows/p.yml create",
			266	+	"refs/heads/rworkflow .github/workflows/moved.yml push",
			267	+	"refs/heads/rworkflow .github/workflows/moved.yml create",
			268	+	"refs/heads/sentinel .github/workflows/p.yml push",
			269	+	"refs/heads/sentinel .github/workflows/p.yml create",
			270	+	}, ownerRuns)
			271	+	assert.Len(t, c.runs(), runsBefore+6, "only the owner's two workflows on rworkflow and one on sentinel, each on push and create")
249		}	272		}
250			273
251		func TestJobTokenCannotPushToAnotherRepository(t *testing.T) {	274		func TestJobTokenCannotPushToAnotherRepository(t *testing.T) {

M internal/app/testdata/web/blob-markdown.html +1 -1


@@ -116,7 +116,7 @@
116	116		<h1 id="md-guide">Guide</h1>
117	117		<h2 id="md-steps">Steps</h2>
118	118		<p>Run it.</p>
119		-	<pre>
	119	+	<pre class="chroma">
120	120		<code class="language-sh">make all
121	121		</code>
122	122		</pre>


@@ -116,7 +116,7 @@
116		<h1 id="md-guide">Guide</h1>	116		<h1 id="md-guide">Guide</h1>
117		<h2 id="md-steps">Steps</h2>	117		<h2 id="md-steps">Steps</h2>
118		<p>Run it.</p>	118		<p>Run it.</p>
119	-	<pre>	119	+	<pre class="chroma">
120		<code class="language-sh">make all	120		<code class="language-sh">make all
121		</code>	121		</code>
122		</pre>	122		</pre>

M internal/app/testdata/web/summary.html +1 -1


@@ -103,7 +103,7 @@
103	103		<h1 id="md-demo">Demo</h1>
104	104		<p>A small <em>demo</em> with a <a href="/demo/blob/main/docs/guide.md">guide</a> and <a href="https://example.org/x" rel="nofollow noopener noreferrer">the site</a>.</p>
105	105		<h2 id="md-install">Install</h2>
106		-	<pre>
	106	+	<pre class="chroma">
107	107		<code class="language-sh">go install example.org/demo@latest
108	108		</code>
109	109		</pre>


@@ -103,7 +103,7 @@
103		<h1 id="md-demo">Demo</h1>	103		<h1 id="md-demo">Demo</h1>
104		<p>A small <em>demo</em> with a <a href="/demo/blob/main/docs/guide.md">guide</a> and <a href="https://example.org/x" rel="nofollow noopener noreferrer">the site</a>.</p>	104		<p>A small <em>demo</em> with a <a href="/demo/blob/main/docs/guide.md">guide</a> and <a href="https://example.org/x" rel="nofollow noopener noreferrer">the site</a>.</p>
105		<h2 id="md-install">Install</h2>	105		<h2 id="md-install">Install</h2>
106	-	<pre>	106	+	<pre class="chroma">
107		<code class="language-sh">go install example.org/demo@latest	107		<code class="language-sh">go install example.org/demo@latest
108		</code>	108		</code>
109		</pre>	109		</pre>

Comments0 open / 0

no comments yet.

Merge settings

Comments0 open / 0