gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2024-09-20 15:26:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

CheckInInterval tests working

Browse source
This commit is contained in:
Matthew R Kasun 2021-04-19 11:56:57 -04:00
parent e4744a6279
commit 420bfe0f6b
2 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
controllers/networkHttpController.go
View file

@ -234,7 +234,7 @@ func keyUpdate(w http.ResponseWriter, r *http.Request) {
{"nodeslastmodified", network.NodesLastModified},
{"networklastmodified", network.NetworkLastModified},
{"allowmanualsignup", network.AllowManualSignUp},
{"defaultcheckininterval", network.DefaultCheckInInterval},
{"checkininterval", network.DefaultCheckInInterval},
}},
}
@ -407,7 +407,7 @@ func updateNetwork(w http.ResponseWriter, r *http.Request) {
{"allowmanualsignup", network.AllowManualSignUp},
{"localrange", network.LocalRange},
{"islocal", network.IsLocal},
{"defaultcheckininterval", network.DefaultCheckInInterval},
{"checkininterval", network.DefaultCheckInInterval},
}},
}

21
test/group_test.go
View file

@ -555,38 +555,33 @@ func TestUpdateNetwork(t *testing.T) {
assert.Equal(t, network.AllowManualSignUp, returnedNetwork.AllowManualSignUp)
})
t.Run("DefaultCheckInterval", func(t *testing.T) {
//value is not updated
t.Skip()
type Network struct {
DefaultCheckInInterval int32
CheckInInterval int32
}
var network Network
network.DefaultCheckInInterval = 6000
network.CheckInInterval = 60
response, err := api(t, network, http.MethodPut, baseURL+"/api/networks/skynet", "secretkey")
assert.Nil(t, err, err)
assert.Equal(t, http.StatusOK, response.StatusCode)
defer response.Body.Close()
err = json.NewDecoder(response.Body).Decode(&returnedNetwork)
assert.Nil(t, err, err)
assert.Equal(t, network.DefaultCheckInInterval, returnedNetwork.DefaultCheckInInterval)
assert.Equal(t, network.CheckInInterval, returnedNetwork.DefaultCheckInInterval)
})
t.Run("DefaultCheckIntervalTooBig", func(t *testing.T) {
//value is not returned in struct ---
t.Skip()
type Network struct {
DefaultCheckInInterval int32
CheckInInterval int32
}
var network Network
network.DefaultCheckInInterval = 100001
network.CheckInInterval = 100001
response, err := api(t, network, http.MethodPut, baseURL+"/api/networks/skynet", "secretkey")
assert.Nil(t, err, err)
var message models.ErrorResponse
err = json.NewDecoder(response.Body).Decode(&message)
assert.Nil(t, err, err)
assert.Equal(t, http.StatusUnprocessableEntity, message.Code)
assert.Equal(t, "W1R3: Field validation for 'DefaultCheckInInterval' failed.", message.Message)
assert.Equal(t, http.StatusUnprocessableEntity, response.StatusCode)
assert.Equal(t, http.StatusBadRequest, message.Code)
assert.Contains(t, message.Message, "Field validation for 'DefaultCheckInInterval' failed")
assert.Equal(t, http.StatusBadRequest, response.StatusCode)
})
t.Run("MultipleFields", func(t *testing.T) {
type Network struct {