Fixed the logic of extracting alloc

This commit is contained in:
Diptanu Choudhury
2016-01-13 11:19:45 -08:00
parent f7c367397f
commit 46bb3fb5cd
2 changed files with 48 additions and 1 deletions

View File

@@ -21,7 +21,6 @@ func (s *HTTPServer) DirectoryListRequest(resp http.ResponseWriter, req *http.Re
func (s *HTTPServer) FileStatRequest(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
var allocID, path string
if allocID = strings.TrimPrefix(req.URL.Path, "/v1/client/fs/stat/"); allocID == "" {
return nil, fmt.Errorf("alloc id not found")
}

View File

@@ -0,0 +1,48 @@
package agent
import (
"net/http"
"net/http/httptest"
"testing"
)
func TestHTTP_FSDirectoryList(t *testing.T) {
httpTest(t, nil, func(s *TestServer) {
req, err := http.NewRequest("GET", "/v1/client/fs/ls", nil)
if err != nil {
t.Fatalf("err: %v", err)
}
respW := httptest.NewRecorder()
_, err = s.Server.DirectoryListRequest(respW, req)
if err == nil {
t.Fatal("expected error")
}
})
}
func TestHTTP_FSStat(t *testing.T) {
httpTest(t, nil, func(s *TestServer) {
req, err := http.NewRequest("GET", "/v1/client/fs/stat/", nil)
if err != nil {
t.Fatalf("err: %v", err)
}
respW := httptest.NewRecorder()
_, err = s.Server.FileStatRequest(respW, req)
if err == nil {
t.Fatal("expected error")
}
req, err = http.NewRequest("GET", "/v1/client/fs/stat/foo", nil)
if err != nil {
t.Fatalf("err: %v", err)
}
respW = httptest.NewRecorder()
_, err = s.Server.FileStatRequest(respW, req)
if err == nil {
t.Fatal("expected error")
}
})
}