Skip to content

Commit 19bba9d

Browse files
praveenkumarpraveenkumar
committed
Fixup: fix unit test for macadam and preflight
1 parent 8167f17 commit 19bba9d

File tree

3 files changed

+33
-9
lines changed

3 files changed

+33
-9
lines changed

‎pkg/crc/macadam/macadam_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ func TestUseMacadam(t *testing.T) {
1212
assert.NotNil(t, config.Runner)
1313
assert.Equal(t, constants.MacadamPath(), config.MacadamExecutablePath)
1414
assert.NotNil(t, config.Env)
15-
assert.Equal(t, 0, len(config.Env))
15+
assert.Equal(t, 1, len(config.Env))
1616
}
1717

1818
func TestSetEnv(t *testing.T) {
1919
config := UseMacadam()
2020
configWithEnv := config.SetEnv("TEST_VAR", "test_value")
2121

22-
assert.Equal(t, 1, len(configWithEnv.Env))
22+
assert.Equal(t, 2, len(configWithEnv.Env))
2323
assert.Equal(t, "test_value", configWithEnv.Env["TEST_VAR"])
2424

2525
// Original config should be unchanged
26-
assert.Equal(t, 0, len(config.Env))
26+
assert.Equal(t, 1, len(config.Env))
2727
}
2828

2929
func TestWithEnv(t *testing.T) {
@@ -44,7 +44,7 @@ func TestSetEnvChaining(t *testing.T) {
4444
config := UseMacadam()
4545
configWithEnv := config.SetEnv("VAR1", "value1").SetEnv("VAR2", "value2")
4646

47-
assert.Equal(t, 2, len(configWithEnv.Env))
47+
assert.Equal(t, 3, len(configWithEnv.Env))
4848
assert.Equal(t, "value1", configWithEnv.Env["VAR1"])
4949
assert.Equal(t, "value2", configWithEnv.Env["VAR2"])
5050
}

‎pkg/crc/preflight/preflight_darwin_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ import (
1313
func TestCountConfigurationOptions(t *testing.T) {
1414
cfg := config.New(config.NewEmptyInMemoryStorage(), config.NewEmptyInMemorySecretStorage())
1515
RegisterSettings(cfg)
16-
assert.Len(t, cfg.AllConfigs(), 14)
16+
assert.Len(t, cfg.AllConfigs(), 16)
1717
}
1818

1919
func TestCountPreflights(t *testing.T) {
20-
assert.Len(t, getPreflightChecks(true, network.SystemNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift, false), 21)
21-
assert.Len(t, getPreflightChecks(true, network.SystemNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift, false), 21)
20+
assert.Len(t, getPreflightChecks(true, network.SystemNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift, false), 23)
21+
assert.Len(t, getPreflightChecks(true, network.SystemNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift, false), 23)
2222

23-
assert.Len(t, getPreflightChecks(true, network.UserNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift, false), 20)
24-
assert.Len(t, getPreflightChecks(true, network.UserNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift, false), 20)
23+
assert.Len(t, getPreflightChecks(true, network.UserNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift, false), 22)
24+
assert.Len(t, getPreflightChecks(true, network.UserNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift, false), 22)
2525
}

‎pkg/crc/preflight/preflight_linux_test.go‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ var checkListForDistros = []checkListForDistro{
7070
{check: checkSupportedCPUArch},
7171
{check: checkCrcSymlink},
7272
{configKeySuffix: "check-ram"},
73+
{check: checkGVProxyExecutableCached},
74+
{check: checkMacadamExecutableCached},
7375
{check: checkPodmanInOcBinDir},
7476
{cleanup: removeCRCMachinesDir},
7577
{cleanup: removeAllLogs},
@@ -111,6 +113,8 @@ var checkListForDistros = []checkListForDistro{
111113
{check: checkSupportedCPUArch},
112114
{check: checkCrcSymlink},
113115
{configKeySuffix: "check-ram"},
116+
{check: checkGVProxyExecutableCached},
117+
{check: checkMacadamExecutableCached},
114118
{check: checkPodmanInOcBinDir},
115119
{cleanup: removeCRCMachinesDir},
116120
{cleanup: removeAllLogs},
@@ -151,6 +155,8 @@ var checkListForDistros = []checkListForDistro{
151155
{check: checkSupportedCPUArch},
152156
{check: checkCrcSymlink},
153157
{configKeySuffix: "check-ram"},
158+
{check: checkGVProxyExecutableCached},
159+
{check: checkMacadamExecutableCached},
154160
{check: checkPodmanInOcBinDir},
155161
{cleanup: removeCRCMachinesDir},
156162
{cleanup: removeAllLogs},
@@ -185,6 +191,8 @@ var checkListForDistros = []checkListForDistro{
185191
{check: checkSupportedCPUArch},
186192
{check: checkCrcSymlink},
187193
{configKeySuffix: "check-ram"},
194+
{check: checkGVProxyExecutableCached},
195+
{check: checkMacadamExecutableCached},
188196
{check: checkPodmanInOcBinDir},
189197
{cleanup: removeCRCMachinesDir},
190198
{cleanup: removeAllLogs},
@@ -226,6 +234,8 @@ var checkListForDistros = []checkListForDistro{
226234
{check: checkSupportedCPUArch},
227235
{check: checkCrcSymlink},
228236
{configKeySuffix: "check-ram"},
237+
{check: checkGVProxyExecutableCached},
238+
{check: checkMacadamExecutableCached},
229239
{check: checkPodmanInOcBinDir},
230240
{cleanup: removeCRCMachinesDir},
231241
{cleanup: removeAllLogs},
@@ -266,6 +276,8 @@ var checkListForDistros = []checkListForDistro{
266276
{check: checkSupportedCPUArch},
267277
{check: checkCrcSymlink},
268278
{configKeySuffix: "check-ram"},
279+
{check: checkGVProxyExecutableCached},
280+
{check: checkMacadamExecutableCached},
269281
{check: checkPodmanInOcBinDir},
270282
{cleanup: removeCRCMachinesDir},
271283
{cleanup: removeAllLogs},
@@ -300,6 +312,8 @@ var checkListForDistros = []checkListForDistro{
300312
{check: checkSupportedCPUArch},
301313
{check: checkCrcSymlink},
302314
{configKeySuffix: "check-ram"},
315+
{check: checkGVProxyExecutableCached},
316+
{check: checkMacadamExecutableCached},
303317
{check: checkPodmanInOcBinDir},
304318
{cleanup: removeCRCMachinesDir},
305319
{cleanup: removeAllLogs},
@@ -341,6 +355,8 @@ var checkListForDistros = []checkListForDistro{
341355
{check: checkSupportedCPUArch},
342356
{check: checkCrcSymlink},
343357
{configKeySuffix: "check-ram"},
358+
{check: checkGVProxyExecutableCached},
359+
{check: checkMacadamExecutableCached},
344360
{check: checkPodmanInOcBinDir},
345361
{cleanup: removeCRCMachinesDir},
346362
{cleanup: removeAllLogs},
@@ -381,6 +397,8 @@ var checkListForDistros = []checkListForDistro{
381397
{check: checkSupportedCPUArch},
382398
{check: checkCrcSymlink},
383399
{configKeySuffix: "check-ram"},
400+
{check: checkGVProxyExecutableCached},
401+
{check: checkMacadamExecutableCached},
384402
{check: checkPodmanInOcBinDir},
385403
{cleanup: removeCRCMachinesDir},
386404
{cleanup: removeAllLogs},
@@ -415,6 +433,8 @@ var checkListForDistros = []checkListForDistro{
415433
{check: checkSupportedCPUArch},
416434
{check: checkCrcSymlink},
417435
{configKeySuffix: "check-ram"},
436+
{check: checkGVProxyExecutableCached},
437+
{check: checkMacadamExecutableCached},
418438
{check: checkPodmanInOcBinDir},
419439
{cleanup: removeCRCMachinesDir},
420440
{cleanup: removeAllLogs},
@@ -457,6 +477,8 @@ var checkListForDistros = []checkListForDistro{
457477
{check: checkSupportedCPUArch},
458478
{check: checkCrcSymlink},
459479
{configKeySuffix: "check-ram"},
480+
{check: checkGVProxyExecutableCached},
481+
{check: checkMacadamExecutableCached},
460482
{check: checkPodmanInOcBinDir},
461483
{cleanup: removeCRCMachinesDir},
462484
{cleanup: removeAllLogs},
@@ -498,6 +520,8 @@ var checkListForDistros = []checkListForDistro{
498520
{check: checkSupportedCPUArch},
499521
{check: checkCrcSymlink},
500522
{configKeySuffix: "check-ram"},
523+
{check: checkGVProxyExecutableCached},
524+
{check: checkMacadamExecutableCached},
501525
{check: checkPodmanInOcBinDir},
502526
{cleanup: removeCRCMachinesDir},
503527
{cleanup: removeAllLogs},

0 commit comments

Comments
 (0)