diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2015-11-19 16:24:09 -0800 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2015-11-19 16:24:09 -0800 |
| commit | 201d6e13045d96a451ab8cd69395ef1c1ed8adcc (patch) | |
| tree | c5067579b0caef66d09133943fb6c281e6d446d8 | |
| parent | 2440f07de8e8816c74c330759d7fa98fc06c27b3 (diff) | |
| parent | 59096b404462742a769696e56510c7ea1bdc6946 (diff) | |
Merge pull request #4161 from carl-mastrangelo/moreInterop1
Add framing http2 test case, enable verbose output, and properly skip tests
| -rw-r--r-- | tools/http2_interop/http2interop_test.go | 17 | ||||
| -rwxr-xr-x | tools/run_tests/run_interop_tests.py | 4 |
2 files changed, 15 insertions, 6 deletions
diff --git a/tools/http2_interop/http2interop_test.go b/tools/http2_interop/http2interop_test.go index 8fd838422b..e3d366f2f2 100644 --- a/tools/http2_interop/http2interop_test.go +++ b/tools/http2_interop/http2interop_test.go @@ -17,7 +17,7 @@ var ( serverHost = flag.String("server_host", "", "The host to test") serverPort = flag.Int("server_port", 443, "The port to test") useTls = flag.Bool("use_tls", true, "Should TLS tests be run") - testCase = flag.String("test_case", "", "What test cases to run") + testCase = flag.String("test_case", "", "What test cases to run (tls, framing)") // The rest of these are unused, but present to fulfill the client interface serverHostOverride = flag.String("server_host_override", "", "Unused") @@ -69,6 +69,9 @@ func (ctx *HTTP2InteropCtx) Close() error { } func TestShortPreface(t *testing.T) { + if *testCase != "framing" { + t.SkipNow() + } ctx := InteropCtx(t) for i := 0; i < len(Preface)-1; i++ { if err := testShortPreface(ctx, Preface[:i]+"X"); err != io.EOF { @@ -78,6 +81,9 @@ func TestShortPreface(t *testing.T) { } func TestUnknownFrameType(t *testing.T) { + if *testCase != "framing" { + t.SkipNow() + } ctx := InteropCtx(t) if err := testUnknownFrameType(ctx); err != nil { t.Fatal(err) @@ -86,7 +92,7 @@ func TestUnknownFrameType(t *testing.T) { func TestTLSApplicationProtocol(t *testing.T) { if *testCase != "tls" { - return + t.SkipNow() } ctx := InteropCtx(t) err := testTLSApplicationProtocol(ctx) @@ -95,7 +101,7 @@ func TestTLSApplicationProtocol(t *testing.T) { func TestTLSMaxVersion(t *testing.T) { if *testCase != "tls" { - return + t.SkipNow() } ctx := InteropCtx(t) err := testTLSMaxVersion(ctx, tls.VersionTLS11) @@ -106,7 +112,7 @@ func TestTLSMaxVersion(t *testing.T) { func TestTLSBadCipherSuites(t *testing.T) { if *testCase != "tls" { - return + t.SkipNow() } ctx := InteropCtx(t) err := testTLSBadCipherSuites(ctx) @@ -114,6 +120,9 @@ func TestTLSBadCipherSuites(t *testing.T) { } func TestClientPrefaceWithStreamId(t *testing.T) { + if *testCase != "framing" { + t.SkipNow() + } ctx := InteropCtx(t) err := testClientPrefaceWithStreamId(ctx) matchError(t, err, "EOF") diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py index 37b8ab19f6..5435a1d02f 100755 --- a/tools/run_tests/run_interop_tests.py +++ b/tools/run_tests/run_interop_tests.py @@ -169,7 +169,7 @@ class Http2Client: self.safename = str(self) def client_args(self): - return ['tools/http2_interop/http2_interop.test'] + return ['tools/http2_interop/http2_interop.test', '-test.v'] def cloud_to_prod_env(self): return {} @@ -305,7 +305,7 @@ _TEST_CASES = ['large_unary', 'empty_unary', 'ping_pong', _AUTH_TEST_CASES = ['compute_engine_creds', 'jwt_token_creds', 'oauth2_auth_token', 'per_rpc_creds'] -_HTTP2_TEST_CASES = ["tls"] +_HTTP2_TEST_CASES = ["tls", "framing"] def docker_run_cmdline(cmdline, image, docker_args=[], cwd=None, environ=None): """Wraps given cmdline array to create 'docker run' cmdline from it.""" |