docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-10-31 10:34:26 +03:00
Code Activity

fixing server tests

Browse Source
This commit is contained in:
David Lawrence
2015-05-12 16:06:30 -07:00
parent 0bc0b4470c
commit 4508a1db9a
2 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/server.go
View File

@@ -3,7 +3,6 @@ package server
import (
"crypto/rand"
"crypto/tls"
"encoding/json"
"log"
"net"
"net/http"

45
server/server_test.go
View File

@@ -6,29 +6,30 @@ import (
"testing"
"time"
"github.com/endophage/go-tuf/signed"
"golang.org/x/net/context"
"github.com/docker/vetinari/config"
)
func TestRunBadCerts(t *testing.T) {
err := Run(context.Background(), &config.Configuration{
Server: config.ServerConf{},
TrustService: config.TrustServiceConf{}})
err := Run(
context.Background(),
config.ServerConf{},
signed.NewEd25519(),
)
if err == nil {
t.Fatal("Passed empty certs, Run should have failed")
}
}
func TestRunBadAddr(t *testing.T) {
config := &config.Configuration{
Server: config.ServerConf{
Addr: "testAddr",
TLSCertFile: "../fixtures/ca.pem",
TLSKeyFile: "../fixtures/ca-key.pem",
},
config := config.ServerConf{
Addr: "testAddr",
TLSCertFile: "../fixtures/ca.pem",
TLSKeyFile: "../fixtures/ca-key.pem",
}
err := Run(context.Background(), config)
err := Run(context.Background(), config, signed.NewEd25519())
if err == nil {
t.Fatal("Passed bad addr, Run should have failed")
}
@@ -37,15 +38,13 @@ func TestRunBadAddr(t *testing.T) {
func TestRunReservedPort(t *testing.T) {
ctx, _ := context.WithCancel(context.Background())
config := &config.Configuration{
Server: config.ServerConf{
Addr: "localhost:80",
TLSCertFile: "../fixtures/vetinari.pem",
TLSKeyFile: "../fixtures/vetinari.key",
},
config := config.ServerConf{
Addr: "localhost:80",
TLSCertFile: "../fixtures/vetinari.pem",
TLSKeyFile: "../fixtures/vetinari.key",
}
err := Run(ctx, config)
err := Run(ctx, config, signed.NewEd25519())
if _, ok := err.(*net.OpError); !ok {
t.Fatalf("Received unexpected err: %s", err.Error())
@@ -58,12 +57,10 @@ func TestRunReservedPort(t *testing.T) {
func TestRunGoodCancel(t *testing.T) {
ctx, cancelFunc := context.WithCancel(context.Background())
config := &config.Configuration{
Server: config.ServerConf{
Addr: "localhost:8002",
TLSCertFile: "../fixtures/vetinari.pem",
TLSKeyFile: "../fixtures/vetinari.key",
},
config := config.ServerConf{
Addr: "localhost:8002",
TLSCertFile: "../fixtures/vetinari.pem",
TLSKeyFile: "../fixtures/vetinari.key",
}
go func() {
@@ -71,7 +68,7 @@ func TestRunGoodCancel(t *testing.T) {
cancelFunc()
}()
err := Run(ctx, config)
err := Run(ctx, config, signed.NewEd25519())
if _, ok := err.(*net.OpError); !ok {
t.Fatalf("Received unexpected err: %s", err.Error())