mirror of
https://github.com/fnproject/fn.git
synced 2022-10-28 21:29:17 +03:00
Fixing tests and CI file
This commit is contained in:
3
Makefile
3
Makefile
@@ -13,6 +13,9 @@ build:
|
|||||||
test:
|
test:
|
||||||
./test.sh
|
./test.sh
|
||||||
|
|
||||||
|
fmt:
|
||||||
|
./go-fmt.sh
|
||||||
|
|
||||||
test-datastore:
|
test-datastore:
|
||||||
cd api/datastore && go test -v ./...
|
cd api/datastore && go test -v ./...
|
||||||
|
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ func getTask(ctx context.Context, url string) (*models.Task, error) {
|
|||||||
span, _ := opentracing.StartSpanFromContext(ctx, "get_task")
|
span, _ := opentracing.StartSpanFromContext(ctx, "get_task")
|
||||||
defer span.Finish()
|
defer span.Finish()
|
||||||
|
|
||||||
req, _ := http.NewRequest("GET", url, nil)
|
req, _ := http.NewRequest(http.MethodGet, url, nil)
|
||||||
resp, err := http.DefaultClient.Do(req.WithContext(ctx))
|
resp, err := http.DefaultClient.Do(req.WithContext(ctx))
|
||||||
defer func() {
|
defer func() {
|
||||||
io.Copy(ioutil.Discard, resp.Body)
|
io.Copy(ioutil.Discard, resp.Body)
|
||||||
@@ -37,7 +37,7 @@ func getTask(ctx context.Context, url string) (*models.Task, error) {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if resp.StatusCode != http.StatusOK {
|
if resp.StatusCode != http.StatusOK {
|
||||||
return nil, errors.New(fmt.Sprintf("Unable to get task. Reason %v", resp.Status))
|
return nil, errors.New(fmt.Sprintf("Unable to get task. Reason: %v", resp.Status))
|
||||||
}
|
}
|
||||||
|
|
||||||
var task models.Task
|
var task models.Task
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ func getTestServer(mockTasks []*models.Task) *httptest.Server {
|
|||||||
c.JSON(http.StatusInternalServerError, err)
|
c.JSON(http.StatusInternalServerError, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
c.JSON(http.StatusAccepted, task)
|
c.JSON(http.StatusOK, task)
|
||||||
}
|
}
|
||||||
|
|
||||||
delHandler := func(c *gin.Context) {
|
delHandler := func(c *gin.Context) {
|
||||||
@@ -120,7 +120,7 @@ func TestGetTaskError(t *testing.T) {
|
|||||||
{
|
{
|
||||||
"url": "/invalid",
|
"url": "/invalid",
|
||||||
"task": getMockTask(),
|
"task": getMockTask(),
|
||||||
"error": "json: cannot unmarshal number into Go value of type models.Task", // TODO WTF!
|
"error": "Unable to get task. Reason: 404 Not Found",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -27,6 +27,8 @@ dependencies:
|
|||||||
|
|
||||||
test:
|
test:
|
||||||
override:
|
override:
|
||||||
|
- make fmt:
|
||||||
|
pwd: $GO_PROJECT
|
||||||
- make test:
|
- make test:
|
||||||
pwd: $GO_PROJECT
|
pwd: $GO_PROJECT
|
||||||
- make test-build-arm:
|
- make test-build-arm:
|
||||||
|
|||||||
Reference in New Issue
Block a user