Fix tests

This commit is contained in:
xenolf 2015-12-27 18:56:44 +01:00
parent 523f3eb250
commit 6b750198f2

View file

@ -27,7 +27,7 @@ func TestNewClient(t *testing.T) {
w.Write(data) w.Write(data)
})) }))
client, err := NewClient(ts.URL, user, keyBits, nil) client, err := NewClient(ts.URL, user, keyBits)
if err != nil { if err != nil {
t.Fatalf("Could not create client: %v", err) t.Fatalf("Could not create client: %v", err)
} }
@ -48,7 +48,7 @@ func TestNewClient(t *testing.T) {
} }
} }
func TestNewClientOptPort(t *testing.T) { func TestClientOptPort(t *testing.T) {
keyBits := 32 // small value keeps test fast keyBits := 32 // small value keeps test fast
key, err := rsa.GenerateKey(rand.Reader, keyBits) key, err := rsa.GenerateKey(rand.Reader, keyBits)
if err != nil { if err != nil {
@ -66,10 +66,12 @@ func TestNewClientOptPort(t *testing.T) {
})) }))
optPort := "1234" optPort := "1234"
client, err := NewClient(ts.URL, user, keyBits, []string{"http-01:" + optPort}) client, err := NewClient(ts.URL, user, keyBits)
if err != nil { if err != nil {
t.Fatalf("Could not create client: %v", err) t.Fatalf("Could not create client: %v", err)
} }
client.SetHTTPPort(optPort)
client.SetTLSPort(optPort)
httpSolver, ok := client.solvers["http-01"].(*httpChallenge) httpSolver, ok := client.solvers["http-01"].(*httpChallenge)
if !ok { if !ok {
@ -81,6 +83,17 @@ func TestNewClientOptPort(t *testing.T) {
if httpSolver.optPort != optPort { if httpSolver.optPort != optPort {
t.Errorf("Expected http-01 to have optPort %s but was %s", optPort, httpSolver.optPort) t.Errorf("Expected http-01 to have optPort %s but was %s", optPort, httpSolver.optPort)
} }
httpsSolver, ok := client.solvers["tls-sni-01"].(*tlsSNIChallenge)
if !ok {
t.Fatal("Expected tls-sni-01 solver to be httpChallenge type")
}
if httpsSolver.jws != client.jws {
t.Error("Expected tls-sni-01 to have same jws as client")
}
if httpsSolver.optPort != optPort {
t.Errorf("Expected tls-sni-01 to have optPort %s but was %s", optPort, httpSolver.optPort)
}
} }
func TestValidate(t *testing.T) { func TestValidate(t *testing.T) {