test: separate SSL server and client check

Current SSL tests are as follows. We start a Tarantool server with
default helpers. "ok" tests are successful if everything had started,
"fail" tests are successful if ping check had failed (aka we failed to
connect). This is a dangerous approach, since "server had failed to
start" here is indistinguishable from "client cannot connect". Moreover,
because of it each tnt_fail test runs for 5 seconds
(10 retry attempts * 500 ms retry wait), which is frustrating. After
this patch, there is a separate check for a server start and for
a client success or fail.

Author: DifferentialOrange

ssl_test.go

@@ -94,7 +94,7 @@ func createClientServerSslOk(t testing.TB, serverOpts,
 	return l, c, msgs, errs
 }
 
-func serverTnt(serverOpts, clientOpts SslOpts, auth Auth) (test_helpers.TarantoolInstance, error) {
+func serverTnt(serverOpts SslOpts, auth Auth) (test_helpers.TarantoolInstance, error) {
 	listen := tntHost + "?transport=ssl&"
 
 	key := serverOpts.KeyFile
@@ -126,7 +126,7 @@ func serverTnt(serverOpts, clientOpts SslOpts, auth Auth) (test_helpers.Tarantoo
 		SslCertsDir:     "testdata",
 		ClientServer:    tntHost,
 		ClientTransport: "ssl",
-		ClientSsl:       clientOpts,
+		ClientSsl:       serverOpts,
 		User:            "test",
 		Pass:            "test",
 		WaitStart:       100 * time.Millisecond,
@@ -139,6 +139,23 @@ func serverTntStop(inst test_helpers.TarantoolInstance) {
 	test_helpers.StopTarantoolWithCleanup(inst)
 }
 
+func checkTntConn(clientOpts SslOpts) error {
+	conn, err := Connect(tntHost, Opts{
+		Auth:       AutoAuth,
+		Timeout:    500 * time.Millisecond,
+		User:       "test",
+		Pass:       "test",
+		SkipSchema: true,
+		Transport:  "ssl",
+		Ssl:        clientOpts,
+	})
+	if err != nil {
+		return err
+	}
+	conn.Close()
+	return nil
+}
+
 func assertConnectionSslFail(t testing.TB, serverOpts, clientOpts SslOpts) {
 	t.Helper()
 
@@ -171,9 +188,13 @@ func assertConnectionSslOk(t testing.TB, serverOpts, clientOpts SslOpts) {
 func assertConnectionTntFail(t testing.TB, serverOpts, clientOpts SslOpts) {
 	t.Helper()
 
-	inst, err := serverTnt(serverOpts, clientOpts, AutoAuth)
-	serverTntStop(inst)
+	inst, err := serverTnt(serverOpts, AutoAuth)
+	if err != nil {
+		t.Errorf("An unexpected server error %q", err.Error())
+	}
+	defer serverTntStop(inst)
 
+	err = checkTntConn(clientOpts)
 	if err == nil {
 		t.Errorf("An unexpected connection to the server")
 	}
@@ -182,12 +203,16 @@ func assertConnectionTntFail(t testing.TB, serverOpts, clientOpts SslOpts) {
 func assertConnectionTntOk(t testing.TB, serverOpts, clientOpts SslOpts) {
 	t.Helper()
 
-	inst, err := serverTnt(serverOpts, clientOpts, AutoAuth)
-	serverTntStop(inst)
-
+	inst, err := serverTnt(serverOpts, AutoAuth)
 	if err != nil {
 		t.Errorf("An unexpected server error %q", err.Error())
 	}
+	defer serverTntStop(inst)
+
+	err = checkTntConn(clientOpts)
+	if err != nil {
+		t.Errorf("An unexpected connection error %q", err.Error())
+	}
 }
 
 type test struct {
@@ -470,11 +495,12 @@ func TestOpts_PapSha256Auth(t *testing.T) {
 		KeyFile:  "testdata/localhost.key",
 		CertFile: "testdata/localhost.crt",
 	}
-	inst, err := serverTnt(sslOpts, sslOpts, PapSha256Auth)
-	defer serverTntStop(inst)
+
+	inst, err := serverTnt(sslOpts, PapSha256Auth)
 	if err != nil {
 		t.Errorf("An unexpected server error: %s", err)
 	}
+	defer serverTntStop(inst)
 
 	clientOpts := opts
 	clientOpts.Transport = "ssl"