revise github-action to resolve cicd error

ironcore-dev · Nov 23, 2023 · 64643d6 · 64643d6
1 parent daeb75b
commit 64643d6
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 39 deletions.
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.20'
+          go-version: '1.18'
       - uses: actions/checkout@v3
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -21,6 +21,6 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.20'
+          go-version: '1.18'
       - run: make
       - run: make test
diff --git a/peer_test.go b/peer_test.go
@@ -49,6 +49,36 @@ var _ = Describe("Peer", func() {
 		mbServer.Shutdown()
 	})
 
+	It("should subscribe", func() {
+		mbClient := NewMetalBond(Config{}, client)
+		localIP := net.ParseIP("127.0.0.2")
+		err := mbClient.AddPeer(serverAddress, localIP.String())
+		Expect(err).NotTo(HaveOccurred())
+
+		time.Sleep(5 * time.Second)
+		vni := VNI(200)
+		err = mbClient.Subscribe(vni)
+		if err != nil {
+			log.Errorf("subscribe failed: %v", err)
+		}
+		Expect(err).NotTo(HaveOccurred())
+
+		vnis := mbClient.GetSubscribedVnis()
+		Expect(len(vnis)).To(Equal(1))
+		Expect(vnis[0]).To(Equal(vni))
+
+		err = mbClient.Unsubscribe(vni)
+		Expect(err).NotTo(HaveOccurred())
+
+		vnis = mbClient.GetSubscribedVnis()
+		Expect(len(vnis)).To(Equal(0))
+
+		err = mbClient.RemovePeer(serverAddress)
+		Expect(err).NotTo(HaveOccurred())
+
+		mbClient.Shutdown()
+	})
+
 	It("should reset", func() {
 		mbClient := NewMetalBond(Config{}, client)
 		err := mbClient.AddPeer(serverAddress, "127.0.0.2")
@@ -144,42 +174,6 @@ var _ = Describe("Peer", func() {
 		Expect(err).NotTo(HaveOccurred())
 	})
 
-	It("should subscribe", func() {
-		mbClient := NewMetalBond(Config{}, client)
-		localIP := net.ParseIP("127.0.0.1")
-		err := mbClient.AddPeer(serverAddress, localIP.String())
-		Expect(err).NotTo(HaveOccurred())
-
-		time.Sleep(1 * time.Second)
-		vni_one := VNI(200)
-		err = mbClient.Subscribe(vni_one)
-		if err != nil {
-			log.Errorf("subscribe failed: %v", err)
-		}
-		Expect(err).NotTo(HaveOccurred())
-
-		vni_two := VNI(300)
-		err = mbClient.Subscribe(vni_two)
-		if err != nil {
-			log.Errorf("subscribe failed: %v", err)
-		}
-		Expect(err).NotTo(HaveOccurred())
-
-		vnis := mbClient.GetSubscribedVnis()
-		Expect(len(vnis)).To(Equal(2))
-		Expect(vnis[0]).To(Equal(vni_one))
-		Expect(vnis[1]).To(Equal(vni_two))
-
-		err = mbClient.Unsubscribe(vni_one)
-		Expect(err).NotTo(HaveOccurred())
-
-		err = mbClient.Unsubscribe(vni_two)
-		Expect(err).NotTo(HaveOccurred())
-
-		vnis = mbClient.GetSubscribedVnis()
-		Expect(len(vnis)).To(Equal(0))
-	})
-
 	It("should announce", func() {
 		totalClients := 1000
 		var wg sync.WaitGroup
@@ -190,7 +184,7 @@ var _ = Describe("Peer", func() {
 			go func(index int) {
 				defer wg.Done()
 				mbClient := NewMetalBond(Config{}, client)
-				localIP := net.ParseIP("127.0.0.1")
+				localIP := net.ParseIP("127.0.0.2")
 				localIP = incrementIPv4(localIP, index)
 				err := mbClient.AddPeer(serverAddress, localIP.String())
 				Expect(err).NotTo(HaveOccurred())