Made zone return errors and http idempotent

The Zone DB tells you if you have a duplicate or missing record, but
the HTTP server smoothes these over.
This commit is contained in:
Michael Bridgen committed 2014-10-21 17:05:03 +01:00
1 parent 5c6410a3c6
commit 0615d122e9
2 files changed
+34 -5

No files matched your search

+22 -2
View File
@@ -41,7 +41,7 @@ func TestHttp(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if resp.StatusCode != 200 {
if resp.StatusCode != http.StatusOK {
t.Fatal("Unexpected http response", resp.Status)
}
@@ -55,12 +55,23 @@ func TestHttp(t *testing.T) {
t.Fatal("Unexpected result for", success_test_name, ip)
}
// Now try adding the same address again - should fail
// Adding exactly the same address should be OK
resp, err = genForm("PUT", addr_url,
url.Values{"fqdn": {success_test_name}, "local_ip": {docker_ip}, "routing_prefix": {addr_parts[1]}})
if err != nil {
t.Fatal(err)
}
if resp.StatusCode != http.StatusOK {
t.Fatal("Expected duplicate add to succeed with 200 OK")
}
// Now try adding the same address again with a different ident - should fail
other_url := fmt.Sprintf("http://localhost:%d/name/%s/%s", port, "other", addr_parts[0])
resp, err = genForm("PUT", other_url,
url.Values{"fqdn": {success_test_name}, "local_ip": {docker_ip}, "routing_prefix": {addr_parts[1]}})
if err != nil {
t.Fatal(err)
}
if resp.StatusCode != http.StatusConflict {
t.Fatal("Unexpected http response", resp.Status)
}
@@ -80,6 +91,15 @@ func TestHttp(t *testing.T) {
t.Fatal(err)
}
// Delete the address again, it should accept this
resp, err = genForm("DELETE", addr_url, nil)
if err != nil {
t.Fatal(err)
}
if resp.StatusCode != http.StatusOK {
t.Fatal("Unexpected http response", resp.Status)
}
// Would like to shut down the http server at the end of this test
// but it's complicated.
// See https://groups.google.com/forum/#!topic/golang-nuts/vLHWa5sHnCE