Skip to content

Commit cbaf8a2

Browse files
author
Tony Zhang
committed
adding network hardclean e2e test
1 parent 760798b commit cbaf8a2

File tree

5 files changed

+26
-9
lines changed

5 files changed

+26
-9
lines changed

tests/e2e/commands/network.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func CleanNetwork() (string, error) {
3232
}
3333

3434
/* #nosec G204 */
35-
func CleanNetworkHard() {
35+
func CleanNetworkHard() (string, error) {
3636
output, err := utils.TestCommand(
3737
utils.NetworkCmd,
3838
"clean",
@@ -47,7 +47,7 @@ func CleanNetworkHard() {
4747
fmt.Println(output)
4848
utils.PrintStdErr(err)
4949
}
50-
gomega.Expect(err).Should(gomega.BeNil())
50+
return output, err
5151
}
5252

5353
/* #nosec G204 */

tests/e2e/testcases/network/clean/suite.go

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@
44
package network
55

66
import (
7+
"path"
8+
9+
"github.com/ava-labs/avalanche-cli/sdk/utils"
710
"github.com/ava-labs/avalanche-cli/tests/e2e/commands"
11+
testUtils "github.com/ava-labs/avalanche-cli/tests/e2e/utils"
812
ginkgo "github.com/onsi/ginkgo/v2"
913
"github.com/onsi/gomega"
1014
)
@@ -24,4 +28,17 @@ var _ = ginkgo.Describe("[Local Network] Clean", ginkgo.Ordered, func() {
2428
gomega.Expect(err).Should(gomega.BeNil())
2529
gomega.Expect(out).Should(gomega.ContainSubstring("No network is running"))
2630
})
31+
32+
ginkgo.It("hard clean should remove downloaded avalanchego and plugins", func() {
33+
out := commands.StartNetwork()
34+
gomega.Expect(out).Should(gomega.ContainSubstring("Network ready to use"))
35+
36+
out, err := commands.CleanNetworkHard()
37+
gomega.Expect(err).Should(gomega.BeNil())
38+
gomega.Expect(out).Should(gomega.ContainSubstring("All existing binaries removed"))
39+
40+
// check if binaries are removed
41+
binDirExists := utils.DirExists(path.Join(testUtils.GetBaseDir(), "bin"))
42+
gomega.Expect(binDirExists).Should(gomega.BeFalse())
43+
})
2744
})

tests/e2e/testcases/packageman/suite.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var _ = ginkgo.Describe("[Package Management]", ginkgo.Ordered, func() {
3030
gomega.Expect(err).Should(gomega.BeNil())
3131
})
3232
ginkgo.BeforeEach(func() {
33-
commands.CleanNetworkHard()
33+
_, _ = commands.CleanNetworkHard()
3434
})
3535

3636
ginkgo.AfterEach(func() {

tests/e2e/testcases/upgrade/non-sov/suite.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ var (
5151
// need to have this outside the normal suite because of the BeforeEach
5252
var _ = ginkgo.Describe("[Upgrade expect network failure non SOV]", ginkgo.Ordered, func() {
5353
ginkgo.AfterEach(func() {
54-
commands.CleanNetworkHard()
54+
_, _ = commands.CleanNetworkHard()
5555
err := utils.DeleteConfigs(subnetName)
5656
gomega.Expect(err).Should(gomega.BeNil())
5757
})
@@ -91,7 +91,7 @@ var _ = ginkgo.Describe("[Upgrade expect network failure non SOV]", ginkgo.Order
9191
// and then check the file is there and has the correct content.
9292
var _ = ginkgo.Describe("[Upgrade public network non SOV]", ginkgo.Ordered, func() {
9393
ginkgo.AfterEach(func() {
94-
commands.CleanNetworkHard()
94+
_, _ = commands.CleanNetworkHard()
9595
err := utils.DeleteConfigs(subnetName)
9696
gomega.Expect(err).Should(gomega.BeNil())
9797
})
@@ -158,7 +158,7 @@ var _ = ginkgo.Describe("[Upgrade local network non SOV]", ginkgo.Ordered, func(
158158
})
159159

160160
ginkgo.AfterEach(func() {
161-
commands.CleanNetworkHard()
161+
_, _ = commands.CleanNetworkHard()
162162
err := utils.DeleteConfigs(subnetName)
163163
gomega.Expect(err).Should(gomega.BeNil())
164164
err = utils.DeleteConfigs(secondSubnetName)

tests/e2e/testcases/upgrade/sov/suite.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ var (
5151
// need to have this outside the normal suite because of the BeforeEach
5252
var _ = ginkgo.Describe("[Upgrade expect network failure SOV]", ginkgo.Ordered, func() {
5353
ginkgo.AfterEach(func() {
54-
commands.CleanNetworkHard()
54+
_, _ = commands.CleanNetworkHard()
5555
err := utils.DeleteConfigs(subnetName)
5656
gomega.Expect(err).Should(gomega.BeNil())
5757
})
@@ -91,7 +91,7 @@ var _ = ginkgo.Describe("[Upgrade expect network failure SOV]", ginkgo.Ordered,
9191
// and then check the file is there and has the correct content.
9292
var _ = ginkgo.Describe("[Upgrade public network SOV]", ginkgo.Ordered, func() {
9393
ginkgo.AfterEach(func() {
94-
commands.CleanNetworkHard()
94+
_, _ = commands.CleanNetworkHard()
9595
err := utils.DeleteConfigs(subnetName)
9696
gomega.Expect(err).Should(gomega.BeNil())
9797
})
@@ -158,7 +158,7 @@ var _ = ginkgo.Describe("[Upgrade local network SOV]", ginkgo.Ordered, func() {
158158
})
159159

160160
ginkgo.AfterEach(func() {
161-
commands.CleanNetworkHard()
161+
_, _ = commands.CleanNetworkHard()
162162
err := utils.DeleteConfigs(subnetName)
163163
gomega.Expect(err).Should(gomega.BeNil())
164164
err = utils.DeleteConfigs(secondSubnetName)

0 commit comments

Comments
 (0)