gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

Merge pull request #562 from lucas-clemente/fix-flaky-server-test

Browse Source 
fix flaky integration tests with the quic_server
This commit is contained in:
Marten Seemann
2017-04-24 15:51:58 +07:00
committed by GitHub
parent 61f5f1e668 f9404ff646
commit 31be6464be
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
integrationtests/server_test.go
View File

@@ -38,11 +38,10 @@ var _ = Describe("Server tests", func() {
key, err := rsa.GenerateKey(rand.Reader, 1024) key, err := rsa.GenerateKey(rand.Reader, 1024)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
t := time.Now().Add(-time.Minute)
templateRoot := &x509.Certificate{ templateRoot := &x509.Certificate{
SerialNumber: big.NewInt(1), SerialNumber: big.NewInt(1),
NotBefore: t, NotBefore: time.Now().Add(-time.Hour),
NotAfter: t.Add(time.Hour), NotAfter: time.Now().Add(time.Hour),
IsCA: true, IsCA: true,
BasicConstraintsValid: true, BasicConstraintsValid: true,
} }
@@ -130,10 +129,11 @@ var _ = Describe("Server tests", func() {
// this CA is used to sign the server's key // this CA is used to sign the server's key
// it is set as a valid CA in the QUIC client // it is set as a valid CA in the QUIC client
rootKey, CACert := generateCA() rootKey, CACert := generateCA()
// generate the server certificate
template := &x509.Certificate{ template := &x509.Certificate{
SerialNumber: big.NewInt(1), SerialNumber: big.NewInt(1),
NotBefore: time.Now(), NotBefore: time.Now().Add(-30 * time.Minute),
NotAfter: time.Now().Add(time.Hour), NotAfter: time.Now().Add(30 * time.Minute),
Subject: pkix.Name{CommonName: "quic.clemente.io"}, Subject: pkix.Name{CommonName: "quic.clemente.io"},
} }
certDER, err := x509.CreateCertificate(rand.Reader, template, CACert, &key.PublicKey, rootKey) certDER, err := x509.CreateCertificate(rand.Reader, template, CACert, &key.PublicKey, rootKey)