Browse Source

e2e: update "leaseTestTimeToLiveExpire"

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
Gyuho Lee 8 years ago
parent
commit
c559b0eede
1 changed files with 2 additions and 6 deletions
  1. 2 6
      e2e/ctl_v3_lease_test.go

+ 2 - 6
e2e/ctl_v3_lease_test.go

@@ -94,12 +94,8 @@ func leaseTestTimeToLiveExpire(cx ctlCtx, ttl int) error {
 	// eliminate false positive
 	// eliminate false positive
 	time.Sleep(time.Duration(ttl+1) * time.Second)
 	time.Sleep(time.Duration(ttl+1) * time.Second)
 	cmdArgs := append(cx.PrefixArgs(), "lease", "timetolive", leaseID)
 	cmdArgs := append(cx.PrefixArgs(), "lease", "timetolive", leaseID)
-	proc, err := spawnCmd(cmdArgs)
-	if err != nil {
-		return err
-	}
-	_, err = proc.Expect("TTL(0s), remaining(-1s)") // expect expired lease
-	if err != nil {
+	exp := fmt.Sprintf("lease %s already expired", leaseID)
+	if err = spawnWithExpect(cmdArgs, exp); err != nil {
 		return err
 		return err
 	}
 	}
 	if err := ctlV3Get(cx, []string{"key"}); err != nil {
 	if err := ctlV3Get(cx, []string{"key"}); err != nil {