test

Signed-off-by: Daichi Sakaue <[email protected]>
cybozu-go · Sep 26, 2024 · 877aea9 · 877aea9
1 parent ce9b253
commit 877aea9
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 21 deletions.
diff --git a/dctest/run_test.go b/dctest/run_test.go
@@ -188,6 +188,14 @@ func execRetryAt(host string, handler retryHandler, args ...string) []byte {
  stdout, stderr, err = execAt(host, args...)
  if err != nil {
  msg := fmt.Sprintf("stdout: %s, stderr: %s, err: %v", string(stdout), string(stderr), err)
+ if handler(string(stdout), string(stderr), err) {
+ stdout := execSafeGomegaAt(g, host, "docker", "ps")
+ fmt.Println(string(stdout))
+ stdout = execSafeGomegaAt(g, host, "docker", "inspect", "etcd")
+ fmt.Println(string(stdout))
+
+ StopTrying("retry aborted. " + msg).Wrap(err).Now()
+ }
  if !handler(string(stdout), string(stderr), err) {
  StopTrying("retry skipped. " + msg).Wrap(err).Now()
  }

diff --git a/dctest/setup_test.go b/dctest/setup_test.go
@@ -36,6 +36,8 @@ WantedBy=multi-user.target`
  mountServicePath := "/lib/systemd/system/home-cybozu-.kube.mount"
 
  for _, v := range bootServers {
+ execSafeAt(v, "sudo", "systemd-analyze", "set-log-level", "debug")
+
  stdout, stderr, err := execAtWithInput(v, []byte(mountUnit), "sudo", "tee", mountServicePath)
  Expect(err).NotTo(HaveOccurred(), "host=%s, stdout=%s, stderr=%s, err=%v", v, stdout, stderr, err)
  execSafeAt(v, "test", "-f", mountServicePath)

diff --git a/dctest/suites_test.go b/dctest/suites_test.go
@@ -48,27 +48,29 @@ var bootstrapSuite = func() {
  Context("setup", testSetup)
  Context("initialize", testInit)
  Context("sabakan", testSabakan)
- Context("machines", testMachines)
- Context("init-data", testInitData)
- Context("etcdpasswd", testEtcdpasswd)
- Context("sabakan-state-setter", testSabakanStateSetter)
- Context("ignitions", testIgnitions)
- Context("cke", func() {
- testCKESetup()
- testCKE()
- testCKEBackupMetrics()
- })
- Context("neco-rebooter", testNecoRebooter)
- Context("coil", func() {
- testCoilSetup()
- testCoil()
- })
- Context("cilium", testCilium)
- Context("unbound", testUnbound)
- Context("squid", testSquid)
- Context("node DNS", testNodeDNS)
- Context("l4lb", testL4LB)
- Context("tools", testTools)
+ if false {
+ Context("machines", testMachines)
+ Context("init-data", testInitData)
+ Context("etcdpasswd", testEtcdpasswd)
+ Context("sabakan-state-setter", testSabakanStateSetter)
+ Context("ignitions", testIgnitions)
+ Context("cke", func() {
+ testCKESetup()
+ testCKE()
+ testCKEBackupMetrics()
+ })
+ Context("neco-rebooter", testNecoRebooter)
+ Context("coil", func() {
+ testCoilSetup()
+ testCoil()
+ })
+ Context("cilium", testCilium)
+ Context("unbound", testUnbound)
+ Context("squid", testSquid)
+ Context("node DNS", testNodeDNS)
+ Context("l4lb", testL4LB)
+ Context("tools", testTools)
+ }
 }
 
 // functionsSuite is a test suite that tests a full set of functions of Neco in a single version