mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
fix bug of deleteing the root
This commit is contained in:
@@ -169,6 +169,7 @@ func UpdateHttpHandler(w http.ResponseWriter, req *http.Request) error {
|
||||
// Delete Handler
|
||||
func DeleteHttpHandler(w http.ResponseWriter, req *http.Request) error {
|
||||
key := req.URL.Path[len("/v2/keys"):]
|
||||
|
||||
debugf("recv.delete[%v] [%v%v]\n", req.RemoteAddr, req.Host, req.URL)
|
||||
|
||||
command := &DeleteCommand{
|
||||
|
||||
@@ -244,6 +244,7 @@ func (fs *FileSystem) Delete(nodePath string, recursive bool, index uint64, term
|
||||
}
|
||||
|
||||
fs.WatcherHub.notify(e)
|
||||
|
||||
return e, nil
|
||||
}
|
||||
|
||||
|
||||
36
transporter_test.go
Normal file
36
transporter_test.go
Normal file
@@ -0,0 +1,36 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"crypto/tls"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestTransporterTimeout(t *testing.T) {
|
||||
|
||||
conf := tls.Config{}
|
||||
|
||||
ts := newTransporter("http", conf, time.Second)
|
||||
|
||||
ts.Get("http://google.com")
|
||||
_, err := ts.Get("http://google.com:9999") // it doesn't exisit
|
||||
if err == nil || err.Error() != "Wait Response Timeout: 1s" {
|
||||
t.Fatal("timeout error: ", err.Error())
|
||||
}
|
||||
|
||||
_, err = ts.Post("http://google.com:9999", nil) // it doesn't exisit
|
||||
if err == nil || err.Error() != "Wait Response Timeout: 1s" {
|
||||
t.Fatal("timeout error: ", err.Error())
|
||||
}
|
||||
|
||||
_, err = ts.Get("http://www.google.com")
|
||||
if err != nil {
|
||||
t.Fatal("get error")
|
||||
}
|
||||
|
||||
_, err = ts.Post("http://www.google.com", nil)
|
||||
if err != nil {
|
||||
t.Fatal("post error")
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user