From ddfe9a19fcedabfec6095df5fa0bebc6a20b9b73 Mon Sep 17 00:00:00 2001 From: francois samin <francois.samin@corp.ovh.com> Date: Tue, 26 Oct 2021 15:43:26 +0200 Subject: [PATCH] test(hatchery): fix test spawn worker Signed-off-by: francois samin <francois.samin@corp.ovh.com> --- engine/api/workermodel/dao_test.go | 23 ----------------------- engine/hatchery/marathon/marathon_test.go | 3 +-- engine/hatchery/vsphere/spawn_test.go | 13 +++++++++---- 3 files changed, 10 insertions(+), 29 deletions(-) diff --git a/engine/api/workermodel/dao_test.go b/engine/api/workermodel/dao_test.go index 70104ca2f7..3fc1d992e6 100644 --- a/engine/api/workermodel/dao_test.go +++ b/engine/api/workermodel/dao_test.go @@ -135,29 +135,6 @@ func TestInsert(t *testing.T) { assert.EqualValues(t, *src, *res) } -func TestMergeModelEnvsWithDefaultEnvs(t *testing.T) { - db, _ := test.SetupPG(t, bootstrap.InitiliazeDB) - - g := assets.InsertGroup(t, db) - - m := sdk.Model{ - Name: sdk.RandomString(10), - Type: sdk.Docker, - ModelDocker: sdk.ModelDocker{ - Image: "foo/bar:3.4", - }, - GroupID: g.ID, - } - require.NoError(t, workermodel.Insert(context.TODO(), db, &m)) - require.Len(t, m.ModelDocker.Envs, 6, "all default vars should be added by insert") - - m.ModelDocker.Envs = map[string]string{ - "myvar": "myvalue", - } - require.NoError(t, workermodel.UpdateDB(context.TODO(), db, &m)) - require.Len(t, m.ModelDocker.Envs, 7, "all default vars should be merged to given vars by update") -} - func TestLoadByNameAndGroupID(t *testing.T) { db, _ := test.SetupPG(t, bootstrap.InitiliazeDB) diff --git a/engine/hatchery/marathon/marathon_test.go b/engine/hatchery/marathon/marathon_test.go index f287deb386..09b0a98f7d 100644 --- a/engine/hatchery/marathon/marathon_test.go +++ b/engine/hatchery/marathon/marathon_test.go @@ -300,8 +300,7 @@ func TestSpawnWorkerTimeout(t *testing.T) { assert.Equal(t, "BRIDGE", a.Container.Docker.Network) assert.Equal(t, float64(1), a.CPUs) assert.Equal(t, 1, *a.Instances) - assert.Equal(t, "1", (*a.Env)["CDS_BOOKED_WORKFLOW_JOB_ID"]) - assert.Equal(t, "GroupModel/fake", (*a.Env)["CDS_MODEL_PATH"]) + assert.NotEmpty(t, (*a.Env)["CDS_CONFIG"]) createAppResult.ID = a.ID createAppResult.Env = a.Env diff --git a/engine/hatchery/vsphere/spawn_test.go b/engine/hatchery/vsphere/spawn_test.go index 8eaf29acc7..2dedd346c1 100644 --- a/engine/hatchery/vsphere/spawn_test.go +++ b/engine/hatchery/vsphere/spawn_test.go @@ -242,7 +242,9 @@ func TestHatcheryVSphere_launchScriptWorker(t *testing.T) { c.EXPECT().StartProgramInGuest(gomock.Any(), &procman, gomock.Any()).DoAndReturn( func(ctx context.Context, procman *guest.ProcessManager, req *types.StartProgramInGuest) (int64, error) { assert.Equal(t, "/bin/echo", req.Spec.GetGuestProgramSpec().ProgramPath) - assert.Equal(t, "-n ;\n./worker register\nshutdown -h now", req.Spec.GetGuestProgramSpec().Arguments) + assert.Contains(t, req.Spec.GetGuestProgramSpec().Arguments, "-n ;\n") + assert.Contains(t, req.Spec.GetGuestProgramSpec().Arguments, "./worker register\nshutdown -h now") + assert.Contains(t, req.Spec.GetGuestProgramSpec().Arguments, "CDS_CONFIG=") return 1, nil }, ) @@ -400,7 +402,9 @@ func TestHatcheryVSphere_SpawnWorker(t *testing.T) { c.EXPECT().StartProgramInGuest(gomock.Any(), &procman, gomock.Any()).DoAndReturn( func(ctx context.Context, procman *guest.ProcessManager, req *types.StartProgramInGuest) (int64, error) { assert.Equal(t, "/bin/echo", req.Spec.GetGuestProgramSpec().ProgramPath) - assert.Equal(t, "-n ;\n./worker\nshutdown -h now", req.Spec.GetGuestProgramSpec().Arguments) + assert.Contains(t, req.Spec.GetGuestProgramSpec().Arguments, "-n ;\n") + assert.Contains(t, req.Spec.GetGuestProgramSpec().Arguments, "./worker\nshutdown -h now") + assert.Contains(t, req.Spec.GetGuestProgramSpec().Arguments, "CDS_CONFIG=") return 1, nil }, ) @@ -577,8 +581,9 @@ func TestHatcheryVSphere_SpawnWorkerFromProvisioning(t *testing.T) { c.EXPECT().StartProgramInGuest(gomock.Any(), &procman, gomock.Any()).DoAndReturn( func(ctx context.Context, procman *guest.ProcessManager, req *types.StartProgramInGuest) (int64, error) { - assert.Equal(t, "/bin/echo", req.Spec.GetGuestProgramSpec().ProgramPath) - assert.Equal(t, "-n ;\n./worker\nshutdown -h now", req.Spec.GetGuestProgramSpec().Arguments) + assert.Contains(t, req.Spec.GetGuestProgramSpec().Arguments, "-n ;\n") + assert.Contains(t, req.Spec.GetGuestProgramSpec().Arguments, "./worker\nshutdown -h now") + assert.Contains(t, req.Spec.GetGuestProgramSpec().Arguments, "CDS_CONFIG=") return 1, nil }, )