docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-07-10 13:37:08 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

avoid import to testing helpers outside of tests

Browse Source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi
2025-04-08 00:01:12 -07:00
parent 8f9c25e8b0
commit 29614f9734
8 changed files with 183 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
util/gitutil/gitutil_test.go
View File

@ -1,32 +1,34 @@
package gitutil
package gitutil_test
import (
"testing"
"github.com/docker/buildx/util/gitutil"
"github.com/docker/buildx/util/gitutil/gittestutil"
"github.com/stretchr/testify/require"
)
func TestGit(t *testing.T) {
c, err := New()
c, err := gitutil.New()
require.NoError(t, err)
out, err := c.run("status")
out, err := c.Run("status")
require.NoError(t, err)
require.NotEmpty(t, out)
out, err = c.clean(c.run("not-exist"))
out, err = c.Run("not-exist")
require.Error(t, err)
require.Empty(t, out)
require.Equal(t, "git: 'not-exist' is not a git command. See 'git --help'.", err.Error())
}
func TestGitFullCommit(t *testing.T) {
Mktmp(t)
c, err := New()
gittestutil.Mktmp(t)
c, err := gitutil.New()
require.NoError(t, err)
GitInit(c, t)
GitCommit(c, t, "bar")
gittestutil.GitInit(c, t)
gittestutil.GitCommit(c, t, "bar")
out, err := c.FullCommit()
require.NoError(t, err)
@ -34,12 +36,12 @@ func TestGitFullCommit(t *testing.T) {
}
func TestGitShortCommit(t *testing.T) {
Mktmp(t)
c, err := New()
gittestutil.Mktmp(t)
c, err := gitutil.New()
require.NoError(t, err)
GitInit(c, t)
GitCommit(c, t, "bar")
gittestutil.GitInit(c, t)
gittestutil.GitCommit(c, t, "bar")
out, err := c.ShortCommit()
require.NoError(t, err)
@ -47,59 +49,59 @@ func TestGitShortCommit(t *testing.T) {
}
func TestGitFullCommitErr(t *testing.T) {
Mktmp(t)
c, err := New()
gittestutil.Mktmp(t)
c, err := gitutil.New()
require.NoError(t, err)
GitInit(c, t)
gittestutil.GitInit(c, t)
_, err = c.FullCommit()
require.Error(t, err)
require.True(t, IsUnknownRevision(err))
require.False(t, IsAmbiguousArgument(err))
require.True(t, gitutil.IsUnknownRevision(err))
require.False(t, gittestutil.IsAmbiguousArgument(err))
}
func TestGitShortCommitErr(t *testing.T) {
Mktmp(t)
c, err := New()
gittestutil.Mktmp(t)
c, err := gitutil.New()
require.NoError(t, err)
GitInit(c, t)
gittestutil.GitInit(c, t)
_, err = c.ShortCommit()
require.Error(t, err)
require.True(t, IsUnknownRevision(err))
require.False(t, IsAmbiguousArgument(err))
require.True(t, gitutil.IsUnknownRevision(err))
require.False(t, gittestutil.IsAmbiguousArgument(err))
}
func TestGitTagsPointsAt(t *testing.T) {
Mktmp(t)
c, err := New()
gittestutil.Mktmp(t)
c, err := gitutil.New()
require.NoError(t, err)
GitInit(c, t)
GitCommit(c, t, "bar")
GitTag(c, t, "v0.8.0")
GitCommit(c, t, "foo")
GitTag(c, t, "v0.9.0")
gittestutil.GitInit(c, t)
gittestutil.GitCommit(c, t, "bar")
gittestutil.GitTag(c, t, "v0.8.0")
gittestutil.GitCommit(c, t, "foo")
gittestutil.GitTag(c, t, "v0.9.0")
out, err := c.clean(c.run("tag", "--points-at", "HEAD", "--sort", "-version:creatordate"))
out, err := c.Run("tag", "--points-at", "HEAD", "--sort", "-version:creatordate")
require.NoError(t, err)
require.Equal(t, "v0.9.0", out)
}
func TestGitDescribeTags(t *testing.T) {
Mktmp(t)
c, err := New()
gittestutil.Mktmp(t)
c, err := gitutil.New()
require.NoError(t, err)
GitInit(c, t)
GitCommit(c, t, "bar")
GitTag(c, t, "v0.8.0")
GitCommit(c, t, "foo")
GitTag(c, t, "v0.9.0")
gittestutil.GitInit(c, t)
gittestutil.GitCommit(c, t, "bar")
gittestutil.GitTag(c, t, "v0.8.0")
gittestutil.GitCommit(c, t, "foo")
gittestutil.GitTag(c, t, "v0.9.0")
out, err := c.clean(c.run("describe", "--tags", "--abbrev=0"))
out, err := c.Run("describe", "--tags", "--abbrev=0")
require.NoError(t, err)
require.Equal(t, "v0.9.0", out)
}
@ -200,16 +202,16 @@ func TestGitRemoteURL(t *testing.T) {
for _, tt := range cases {
tt := tt
t.Run(tt.name, func(t *testing.T) {
Mktmp(t)
c, err := New()
gittestutil.Mktmp(t)
c, err := gitutil.New()
require.NoError(t, err)
GitInit(c, t)
GitCommit(c, t, "initial commit")
gittestutil.GitInit(c, t)
gittestutil.GitCommit(c, t, "initial commit")
for _, r := range tt.remotes {
GitSetRemote(c, t, r.name, r.url)
gittestutil.GitSetRemote(c, t, r.name, r.url)
if r.tracking != "" {
GitSetMainUpstream(c, t, r.name, r.tracking)
gittestutil.GitSetMainUpstream(c, t, r.name, r.tracking)
}
}
@ -223,45 +225,3 @@ func TestGitRemoteURL(t *testing.T) {
})
}
}
func TestStripCredentials(t *testing.T) {
cases := []struct {
name string
url string
want string
}{
{
name: "non-blank Password",
url: "https://user:password@host.tld/this:that",
want: "https://host.tld/this:that",
},
{
name: "blank Password",
url: "https://user@host.tld/this:that",
want: "https://host.tld/this:that",
},
{
name: "blank Username",
url: "https://:password@host.tld/this:that",
want: "https://host.tld/this:that",
},
{
name: "blank Username, blank Password",
url: "https://host.tld/this:that",
want: "https://host.tld/this:that",
},
{
name: "invalid URL",
url: "1https://foo.com",
want: "1https://foo.com",
},
}
for _, tt := range cases {
tt := tt
t.Run(tt.name, func(t *testing.T) {
if g, w := stripCredentials(tt.url), tt.want; g != w {
t.Fatalf("got: %q\nwant: %q", g, w)
}
})
}
}