Skip to content

Commit f9a3404

Browse files
committed
Update gittestserver
New gittestserver fixes the issue with custom branch in an initialized repo. Signed-off-by: Sunny <[email protected]>
1 parent 5bd08a6 commit f9a3404

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7
1212
github.com/cyphar/filepath-securejoin v0.2.2
1313
github.com/fluxcd/pkg/apis/meta v0.10.0
14-
github.com/fluxcd/pkg/gittestserver v0.4.0
14+
github.com/fluxcd/pkg/gittestserver v0.4.1
1515
github.com/fluxcd/pkg/gitutil v0.1.0
1616
github.com/fluxcd/pkg/helmtestserver v0.2.0
1717
github.com/fluxcd/pkg/lockedfile v0.1.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,8 @@ github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
266266
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
267267
github.com/fluxcd/pkg/apis/meta v0.10.0 h1:N7wVGHC1cyPdT87hrDC7UwCwRwnZdQM46PBSLjG2rlE=
268268
github.com/fluxcd/pkg/apis/meta v0.10.0/go.mod h1:CW9X9ijMTpNe7BwnokiUOrLl/h13miwVr/3abEQLbKE=
269-
github.com/fluxcd/pkg/gittestserver v0.4.0 h1:VQzQ5TcHzohxbYGWpnQ/79w7/rnS2SQGC7FSDtbIsCA=
270-
github.com/fluxcd/pkg/gittestserver v0.4.0/go.mod h1:hUPx21fe/6oox336Wih/XF1fnmzLmptNMOvATbTZXNY=
269+
github.com/fluxcd/pkg/gittestserver v0.4.1 h1:knghRrVEEPnpO0VJYjoz0H2YMc4fnKAVt5hDGsB1IHc=
270+
github.com/fluxcd/pkg/gittestserver v0.4.1/go.mod h1:hUPx21fe/6oox336Wih/XF1fnmzLmptNMOvATbTZXNY=
271271
github.com/fluxcd/pkg/gitutil v0.1.0 h1:VO3kJY/CKOCO4ysDNqfdpTg04icAKBOSb3lbR5uE/IE=
272272
github.com/fluxcd/pkg/gitutil v0.1.0/go.mod h1:Ybz50Ck5gkcnvF0TagaMwtlRy3X3wXuiri1HVsK5id4=
273273
github.com/fluxcd/pkg/helmtestserver v0.2.0 h1:cE7YHDmrWI0hr9QpaaeQ0vQ16Z0IiqZKiINDpqdY610=

pkg/git/strategy/strategy_test.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,7 @@ func TestCheckoutStrategyForImplementation_Auth(t *testing.T) {
161161
}
162162

163163
// Initialize a git repo.
164-
// TODO: Fix pkg/gittestserver InitRepo() bug to enable creating
165-
// custom branch.
166-
// branch := "main"
167-
branch := "master"
164+
branch := "main"
168165
repoPath := "bar/test-reponame"
169166
err = gitServer.InitRepo("testdata/repo1", branch, repoPath)
170167
g.Expect(err).ToNot(HaveOccurred())
@@ -222,7 +219,7 @@ func TestCheckoutStrategyForImplementation_SemVerCheckout(t *testing.T) {
222219
defer gitServer.StopHTTP()
223220

224221
repoPath := "bar/test-reponame"
225-
err = gitServer.InitRepo("testdata/repo1", "master", repoPath)
222+
err = gitServer.InitRepo("testdata/repo1", "main", repoPath)
226223
g.Expect(err).ToNot(HaveOccurred())
227224

228225
repoURL := gitServer.HTTPAddressWithCredentials() + "/" + repoPath

0 commit comments

Comments
 (0)