Merge pull request #1803 from lucas-clemente/fix-racy-test-skipping

fix skipping of racy version negotiation integration test
This commit is contained in:
Marten Seemann
2019-03-05 18:04:06 +09:00
committed by GitHub

View File

@@ -57,16 +57,13 @@ var _ = Describe("Handshake tests", func() {
return server return server
} }
if !israce.Enabled {
Context("Version Negotiation", func() { Context("Version Negotiation", func() {
var supportedVersions []protocol.VersionNumber var supportedVersions []protocol.VersionNumber
BeforeEach(func() { BeforeEach(func() {
supportedVersions = protocol.SupportedVersions supportedVersions = protocol.SupportedVersions
protocol.SupportedVersions = append(protocol.SupportedVersions, []protocol.VersionNumber{7, 8, 9, 10}...) protocol.SupportedVersions = append(protocol.SupportedVersions, []protocol.VersionNumber{7, 8, 9, 10}...)
if israce.Enabled {
Skip("This test modifies protocol.SupportedVersions, and can't be run with race detector.")
}
}) })
AfterEach(func() { AfterEach(func() {
@@ -100,6 +97,7 @@ var _ = Describe("Handshake tests", func() {
Expect(sess.Close()).To(Succeed()) Expect(sess.Close()).To(Succeed())
}) })
}) })
}
Context("Certifiate validation", func() { Context("Certifiate validation", func() {
for _, v := range protocol.SupportedVersions { for _, v := range protocol.SupportedVersions {