From 797259358641b13f4cdbe8f4ec140fa520226f17 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Fri, 25 Mar 2016 00:56:20 +0900 Subject: [PATCH] integration: Fix tests --- integration-tests/server_tester.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/integration-tests/server_tester.go b/integration-tests/server_tester.go index 67bbec32..3cebc7e2 100644 --- a/integration-tests/server_tester.go +++ b/integration-tests/server_tester.go @@ -116,8 +116,6 @@ func newServerTesterInternal(src_args []string, t *testing.T, handler http.Handl if frontendTLS { scheme = "https" args = append(args, testDir+"/server.key", testDir+"/server.crt") - } else { - args = append(args, "--frontend-no-tls") } backendURL, err := url.Parse(ts.URL) @@ -129,9 +127,15 @@ func newServerTesterInternal(src_args []string, t *testing.T, handler http.Handl // "127.0.0.1,8080" b := "-b" + strings.Replace(backendURL.Host, ":", ",", -1) if backendTLS { - b += ";;proto=h2" + b += ";;proto=h2;tls" } - args = append(args, fmt.Sprintf("-f127.0.0.1,%v", serverPort), b, + + noTLS := "no-tls" + if frontendTLS { + noTLS = "" + } + + args = append(args, fmt.Sprintf("-f127.0.0.1,%v;%v", serverPort, noTLS), b, "--errorlog-file="+logDir+"/log.txt", "-LINFO") authority := fmt.Sprintf("127.0.0.1:%v", serverPort)