Skip to content

test: refactor asserts #1949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions pkg/cidata/cidata_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@ func TestSetupEnv(t *testing.T) {
netLookupIP = fakeLookupIP
urlMustParse := func(urlStr string) *url.URL {
u, err := url.Parse(urlStr)
if err != nil {
panic(err)
}

assert.NilError(t, err)
return u
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/networks/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
func TestFillDefault(t *testing.T) {
nwYaml := YAML{}
newYaml, err := fillDefaults(nwYaml)
assert.Check(t, err == nil)
assert.NilError(t, err)

userNet := newYaml.Networks[ModeUserV2]
assert.Equal(t, userNet.Mode, ModeUserV2)
Expand Down
12 changes: 3 additions & 9 deletions pkg/networks/usernet/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,19 @@ func TestUsernetConfig(t *testing.T) {

t.Run("verify dns ip", func(t *testing.T) {
subnet, _, err := net.ParseCIDR(networks.SlirpNetwork)
if err != nil {
t.Fatal(err)
}
assert.NilError(t, err)
assert.Equal(t, DNSIP(subnet), "192.168.5.3")
})

t.Run("verify gateway ip", func(t *testing.T) {
subnet, _, err := net.ParseCIDR(networks.SlirpNetwork)
if err != nil {
t.Fatal(err)
}
assert.NilError(t, err)
assert.Equal(t, GatewayIP(subnet), "192.168.5.2")
})

t.Run("verify subnet via config ip", func(t *testing.T) {
subnet, err := Subnet("user-v2")
if err != nil {
t.Fatal(err)
}
assert.NilError(t, err)
assert.Equal(t, subnet.String(), "192.168.104.0")
})
}
12 changes: 3 additions & 9 deletions pkg/networks/usernet/gvproxy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,11 @@ nameserver 8.8.8.8`)

func createResolveFile(t *testing.T, file string, content string) {
f, err := os.Create(file)
if err != nil {
t.Fatal(err)
}
assert.NilError(t, err)
t.Cleanup(func() { _ = f.Close() })
writer := bufio.NewWriter(f)
_, err = writer.Write([]byte(content))
if err != nil {
t.Fatal(err)
}
assert.NilError(t, err)
err = writer.Flush()
if err != nil {
t.Fatal(err)
}
assert.NilError(t, err)
}