htwkmooc/poseidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wrong environment id at monitoring

Browse Source 
data for created or updated environments.
This commit is contained in:
Maximilian Paß
2022-10-13 21:51:53 +01:00
committed by Sebastian Serth
parent a1d30f00c6
commit 5d54b0f786
5 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/api/environments_test.go
View File

@ -87,10 +87,10 @@ func (s *EnvironmentControllerTestSuite) TestList() {
s.Run("returns multiple environments", func() {
call.Run(func(args mock.Arguments) {
firstEnvironment, err := environment.NewNomadEnvironment(nil,
firstEnvironment, err := environment.NewNomadEnvironment(tests.DefaultEnvironmentIDAsInteger, nil,
"job \""+nomad.TemplateJobID(tests.DefaultEnvironmentIDAsInteger)+"\" {}")
s.Require().NoError(err)
secondEnvironment, err := environment.NewNomadEnvironment(nil,
secondEnvironment, err := environment.NewNomadEnvironment(tests.DefaultEnvironmentIDAsInteger, nil,
"job \""+nomad.TemplateJobID(tests.AnotherEnvironmentIDAsInteger)+"\" {}")
s.Require().NoError(err)
call.ReturnArguments = mock.Arguments{[]runner.ExecutionEnvironment{firstEnvironment, secondEnvironment}, nil}
@ -149,7 +149,7 @@ func (s *EnvironmentControllerTestSuite) TestGet() {
s.Run("returns environment", func() {
call.Run(func(args mock.Arguments) {
testEnvironment, err := environment.NewNomadEnvironment(nil,
testEnvironment, err := environment.NewNomadEnvironment(tests.DefaultEnvironmentIDAsInteger, nil,
"job \""+nomad.TemplateJobID(tests.DefaultEnvironmentIDAsInteger)+"\" {}")
s.Require().NoError(err)
call.ReturnArguments = mock.Arguments{testEnvironment, nil}

2
internal/api/websocket_test.go
View File

@ -333,7 +333,7 @@ func newRunnerWithNotMockedRunnerManager(t *testing.T, apiMock *nomad.ExecutorAP
runnerID := tests.DefaultRunnerID
runnerJob := runner.NewNomadJob(runnerID, nil, apiMock, runnerManager.Return)
e, err := environment.NewNomadEnvironment(apiMock, "job \"template-0\" {}")
e, err := environment.NewNomadEnvironment(0, apiMock, "job \"template-0\" {}")
require.NoError(t, err)
eID, err := nomad.EnvironmentIDFromRunnerID(runnerID)
require.NoError(t, err)