test: try fix test

Author: dmyger

test_helpers/main.go

@@ -86,40 +86,37 @@ type TarantoolInstance struct {
 	// Dialer to check that connection established.
 	Dialer tarantool.Dialer
 
-	done        chan error
+	is_stopping bool
 	is_done     bool
 	result      error
-	is_stopping bool
-}
-
-// Status checks if Tarantool instance is still running.
-// Return true if it is running, false if it is not.
-// If instance was exit and error is nil - process completed success with zero status code.
-func (t *TarantoolInstance) Status() (bool, error) {
-	if t.is_done {
-		return false, t.result
-	}
-
-	select {
-	case t.result = <-t.done:
-		t.is_done = true
-		return false, t.result
-	default:
-		return true, nil
-	}
 }
 
 func (t *TarantoolInstance) checkDone() {
 	t.is_done = false
 	t.is_stopping = false
-	t.done = make(chan error, 1)
-	t.done <- t.Cmd.Wait()
+	t.result = t.Cmd.Wait()
+	t.is_done = true
 	if !t.is_stopping {
-		_, err := t.Status()
-		log.Printf("Tarantool was unexpected terminated: %s", err)
+		log.Printf("Tarantool %q was unexpected terminated: %s", t.Opts.Listen, t.result)
 	}
 }
 
+func (t *TarantoolInstance) Stop() error {
+	log.Printf("Stopping Tarantool instance %q", t.Opts.Listen)
+	t.is_stopping = true
+	if t.is_done {
+		return nil
+	}
+	if t.Cmd != nil && t.Cmd.Process != nil {
+		if err := t.Cmd.Process.Kill(); err != nil && !t.is_done {
+			return fmt.Errorf("failed to kill tarantool %q (pid %d), got %s",
+				t.Opts.Listen, t.Cmd.Process.Pid, err)
+		}
+	}
+	t.Cmd.Process = nil
+	return nil
+}
+
 func isReady(dialer tarantool.Dialer, opts *tarantool.Opts) error {
 	var err error
 	var conn *tarantool.Connection
@@ -327,15 +324,16 @@ func StartTarantool(startOpts StartOpts) (TarantoolInstance, error) {
 		}
 	}
 
-	working, err_st := inst.Status()
-	if !working || err_st != nil {
+	if inst.is_done && inst.result != nil {
 		StopTarantool(inst)
-		return TarantoolInstance{}, fmt.Errorf("unexpected terminated Tarantool: %w", err_st)
+		return TarantoolInstance{}, fmt.Errorf("unexpected terminated Tarantool %q: %w",
+			inst.Opts.Listen, inst.result)
 	}
 
 	if err != nil {
 		StopTarantool(inst)
-		return TarantoolInstance{}, fmt.Errorf("failed to connect Tarantool: %w", err)
+		return TarantoolInstance{}, fmt.Errorf("failed to connect Tarantool %q: %w",
+			inst.Opts.Listen, err)
 	}
 
 	return inst, nil
@@ -345,25 +343,9 @@ func StartTarantool(startOpts StartOpts) (TarantoolInstance, error) {
 // with StartTarantool. Waits until any resources
 // associated with the process is released. If something went wrong, fails.
 func StopTarantool(inst TarantoolInstance) {
-	log.Printf("Stopping Tarantool instance")
-	inst.is_stopping = true
-	if inst.Cmd != nil && inst.Cmd.Process != nil {
-		if err := inst.Cmd.Process.Kill(); err != nil {
-			is_running, _ := inst.Status()
-			if is_running {
-				log.Fatalf("Failed to kill tarantool (pid %d), got %s", inst.Cmd.Process.Pid, err)
-			}
-		}
-
-		// Wait releases any resources associated with the Process.
-		if _, err := inst.Cmd.Process.Wait(); err != nil {
-			is_running, _ := inst.Status()
-			if is_running {
-				log.Fatalf("Failed to wait for Tarantool process to exit, got %s", err)
-			}
-		}
-
-		inst.Cmd.Process = nil
+	err := inst.Stop()
+	if err != nil {
+		log.Fatal(err)
 	}
 }