Skip to content

Commit

Permalink
fix2
Browse files Browse the repository at this point in the history
  • Loading branch information
庄润梓 committed Jun 14, 2024
1 parent 0e0f9b9 commit 693a722
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 64 deletions.
Empty file.
74 changes: 10 additions & 64 deletions tests/e2e/greptimedbcluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,27 +66,14 @@ type TestData struct {
var _ = Describe("Basic test of greptimedb cluster", func() {
It("Bootstrap cluster", func() {
var err error
Context("when greptimedb cluster running in k8s", func() {
It("test greotimedb cluster in k8s", func() {
err = createCluster()
Expect(err).NotTo(HaveOccurred(), "failed to create cluster")

err = getCluster()
Expect(err).NotTo(HaveOccurred(), "failed to get cluster")

err = listCluster()
Expect(err).NotTo(HaveOccurred(), "failed to list cluster")
})
})
Context("when greptimedb cluster running in baremetal", func() {
It("test greptimedb cluster in baremetal", func() {
err = createClusterinBaremetal()
Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")

err = getClusterinBaremetal()
Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
})
})
err = createCluster()
Expect(err).NotTo(HaveOccurred(), "failed to create cluster")

err = getCluster()
Expect(err).NotTo(HaveOccurred(), "failed to get cluster")

err = listCluster()
Expect(err).NotTo(HaveOccurred(), "failed to list cluster")

go func() {
forwardRequest()
Expand Down Expand Up @@ -149,19 +136,8 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
}
Expect(len(data) == testRowIDNum).Should(BeTrue(), "get the wrong data from db")

Context("when greptimedb cluster running in k8s", func() {
It("test greotimedb cluster in k8s", func() {
err = deleteCluster()
Expect(err).NotTo(HaveOccurred(), "failed to delete cluster")
})
})

Context("when greptimedb cluster running in baremetal", func() {
It("test greptimedb cluster in baremetal", func() {
err = deleteClusterinBaremetal()
Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")
})
})
err = deleteCluster()
Expect(err).NotTo(HaveOccurred(), "failed to delete cluster")
})
})

Expand All @@ -175,16 +151,6 @@ func createCluster() error {
return nil
}

func createClusterinBaremetal() error {
cmd := exec.Command("../../bin/gtctl", "cluster", "create", "mydb", "--timeout", "300", "--bare-metal")
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {
return err
}
return nil
}

func getCluster() error {
cmd := exec.Command("../../bin/gtctl", "cluster", "get", "mydb")
cmd.Stdout = os.Stdout
Expand All @@ -195,16 +161,6 @@ func getCluster() error {
return nil
}

func getClusterinBaremetal() error {
cmd := exec.Command("../../bin/gtctl", "cluster", "get", "mydb", "--bare-metal")
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {
return err
}
return nil
}

func listCluster() error {
cmd := exec.Command("../../bin/gtctl", "cluster", "list")
cmd.Stdout = os.Stdout
Expand All @@ -225,16 +181,6 @@ func deleteCluster() error {
return nil
}

func deleteClusterinBaremetal() error {
cmd := exec.Command("../../bin/gtctl", "cluster", "delete", "mydb", "--tear-down-etcd", "--bare-metal")
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {
return err
}
return nil
}

func forwardRequest() {
for {
cmd := exec.Command("kubectl", "port-forward", "svc/mydb-frontend", "4002:4002")
Expand Down

0 comments on commit 693a722

Please sign in to comment.