tls: Fix failing test

mholt · mholt · commit 4b6e0e936902 · 2016-01-12T08:55:01.000-07:00
diff --git a/caddy/setup/tls_test.go b/caddy/setup/tls_test.go
@@ -64,12 +64,11 @@ func TestTLSParseBasic(t *testing.T) {
 }
 
 func TestTLSParseIncompleteParams(t *testing.T) {
-	// This doesn't do anything useful but is allowed in case the user wants to be explicit
-	// about TLS being enabled...
+	// Using tls without args is an error because it's unnecessary.
 	c := NewTestController(`tls`)
 	_, err := TLS(c)
-	if err != nil {
-		t.Errorf("Expected no error, but got %v", err)
+	if err == nil {
+		t.Error("Expected an error, but didn't get one")
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -64,12 +64,11 @@ func TestTLSParseBasic(t *testing.T) {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`func TestTLSParseIncompleteParams(t *testing.T) {`
`67`		`- // This doesn't do anything useful but is allowed in case the user wants to be explicit`
`68`		`- // about TLS being enabled...`
	`67`	`+ // Using tls without args is an error because it's unnecessary.`
`69`	`68`	c := NewTestController(`tls`)
`70`	`69`	`_, err := TLS(c)`
`71`		`- if err != nil {`
`72`		`- t.Errorf("Expected no error, but got %v", err)`
	`70`	`+ if err == nil {`
	`71`	`+ t.Error("Expected an error, but didn't get one")`
`73`	`72`	`}`
`74`	`73`	`}`
`75`	`74`