fix neco-reboter_test.go to use strimgs.TrimSpace

cybozu-go · Sep 12, 2024 · 661ec7e · 661ec7e
1 parent f20f197
commit 661ec7e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/dctest/neco-rebooter_test.go b/dctest/neco-rebooter_test.go
@@ -21,7 +21,7 @@ func testNecoRebooter() {
 			if len(stdout) == 0 {
 				return errors.New("no leader")
 			}
-			leaderNodeBefore = strings.TrimSuffix(string(stdout), "\n")
+			leaderNodeBefore = strings.TrimSpace(string(stdout))
 			return nil
 		}).Should(Succeed())
 
@@ -40,7 +40,7 @@ func testNecoRebooter() {
 			if len(stdout) == 0 {
 				return errors.New("no leader")
 			}
-			leaderNodeAfter := strings.TrimSuffix(string(stdout), "\n")
+			leaderNodeAfter := strings.TrimSpace(string(stdout))
 			if leaderNodeAfter == leaderNodeBefore {
 				return errors.New("leader is not changed")
 			}

diff --git a/dctest/reboot_test.go b/dctest/reboot_test.go
@@ -343,7 +343,7 @@ func testNecoRebooterRebootGracefully() {
 		Expect(err).NotTo(HaveOccurred(), "stdout: %s, stderr: %s", stdout, stderr)
 
 		By(fmt.Sprintf("adding %s nodes to reboot-list", racks[0]))
-		// [:4] is number of "rack"
+		// racks[0][:4] represents the rack number
 		execSafeAt(bootServers[0], "yes", "|", "neco", "rebooter", "reboot-worker", "--rack="+racks[0][4:])
 
 		By("enable rebooting")
@@ -363,7 +363,7 @@ func testNecoRebooterRebootGracefully() {
 		}).Should(Succeed())
 
 		By(fmt.Sprintf("adding %s nodes to reboot-list", racks[1]))
-		// [:4] is number of "rack"
+		// racks[0][:4] represents the rack number
 		execSafeAt(bootServers[0], "yes", "|", "neco", "rebooter", "reboot-worker", "--rack="+racks[1][4:])
 
 		By(fmt.Sprintf("waiting for skipping %s and moving to %s", racks[0], racks[1]))