Skip to content

Commit c3dc161

Browse files
authored
chore: add longform boolean unit tests (runfinch#1186)
Signed-off-by: Arjun Raja Yogidas <[email protected]>
1 parent e6ba6e8 commit c3dc161

File tree

3 files changed

+75
-1
lines changed

3 files changed

+75
-1
lines changed

Diff for: cmd/finch/nerdctl_darwin_test.go

+35
Original file line numberDiff line numberDiff line change
@@ -1171,6 +1171,41 @@ func TestNerdctlCommand_run(t *testing.T) {
11711171
c.EXPECT().Run()
11721172
},
11731173
},
1174+
{
1175+
name: "with long-form boolean flags",
1176+
cmdName: "run",
1177+
fc: &config.Finch{},
1178+
args: []string{
1179+
"--env", "ARG1=val1", "-p", "8080:8080",
1180+
"--name", "myContainer", "--interactive=true", "--detach", "--rm=true", "--init=false",
1181+
"--tty=true", "--debug-full=false", "--sig-proxy=0",
1182+
"--experimental=false", "--oom-kill-disable=false", "--read-only=false",
1183+
"--privileged=false", "alpine:latest", "env",
1184+
},
1185+
wantErr: nil,
1186+
mockSvc: func(
1187+
_ *testing.T,
1188+
lcc *mocks.NerdctlCmdCreator,
1189+
_ *mocks.CommandCreator,
1190+
ncsd *mocks.NerdctlCommandSystemDeps,
1191+
logger *mocks.Logger,
1192+
ctrl *gomock.Controller,
1193+
_ afero.Fs,
1194+
) {
1195+
getVMStatusC := mocks.NewCommand(ctrl)
1196+
lcc.EXPECT().CreateWithoutStdio("ls", "-f", "{{.Status}}", limaInstanceName).Return(getVMStatusC)
1197+
getVMStatusC.EXPECT().Output().Return([]byte("Running"), nil)
1198+
logger.EXPECT().Debugf("Status of virtual machine: %s", "Running")
1199+
AddEmptyEnvLookUps(ncsd)
1200+
c := mocks.NewCommand(ctrl)
1201+
lcc.EXPECT().Create("shell", limaInstanceName, "sudo", "-E", nerdctlCmdName, "container", "run",
1202+
"-p", "8080:8080", "--name", "myContainer", "--interactive=true", "--detach", "--rm=true",
1203+
"--init=false", "--tty=true", "--debug-full", "false", "--sig-proxy=0",
1204+
"--experimental", "false", "--oom-kill-disable=false", "--read-only=false",
1205+
"--privileged=false", "-e", "ARG1=val1", "alpine:latest", "env").Return(c)
1206+
c.EXPECT().Run()
1207+
},
1208+
},
11741209
}
11751210

11761211
for _, tc := range testCases {

Diff for: cmd/finch/nerdctl_native.go

-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ func (nc *nerdctlCommand) run(cmdName string, args []string) error {
9393
}
9494

9595
return nc.ncc.Create(cmdArgs...).Run()
96-
9796
}
9897

9998
var osAliasMap = map[string]string{}

Diff for: cmd/finch/nerdctl_windows_test.go

+40
Original file line numberDiff line numberDiff line change
@@ -769,6 +769,46 @@ func TestNerdctlCommand_run(t *testing.T) {
769769
c.EXPECT().Run()
770770
},
771771
},
772+
{
773+
name: "with long-form boolean flags",
774+
cmdName: "run",
775+
fc: &config.Finch{},
776+
args: []string{
777+
"--env", "ARG1=val1", "-p", "8080:8080",
778+
"--name", "myContainer", "--interactive=true", "--detach", "--rm=true", "--init=false",
779+
"--tty=true", "--debug-full=false", "--sig-proxy=0",
780+
"--experimental=false", "--oom-kill-disable=false", "--read-only=false",
781+
"--privileged=false", "alpine:latest", "env",
782+
},
783+
wantErr: nil,
784+
mockSvc: func(
785+
_ *testing.T,
786+
_ *mocks.CommandCreator,
787+
ncc *mocks.NerdctlCmdCreator,
788+
_ *mocks.Command,
789+
ncsd *mocks.NerdctlCommandSystemDeps,
790+
logger *mocks.Logger,
791+
ctrl *gomock.Controller,
792+
_ afero.Fs,
793+
) {
794+
getVMStatusC := mocks.NewCommand(ctrl)
795+
ncc.EXPECT().CreateWithoutStdio("ls", "-f", "{{.Status}}", limaInstanceName).Return(getVMStatusC)
796+
getVMStatusC.EXPECT().Output().Return([]byte("Running"), nil)
797+
logger.EXPECT().Debugf("Status of virtual machine: %s", "Running")
798+
AddEmptyEnvLookUps(ncsd)
799+
ncsd.EXPECT().GetWd().Return("C:\\workdir", nil)
800+
ncsd.EXPECT().FilePathAbs("C:\\workdir").Return("C:\\workdir", nil)
801+
ncsd.EXPECT().FilePathJoin(string(filepath.Separator), "mnt", "c", "workdir").Return(augmentedPath)
802+
ncsd.EXPECT().FilePathToSlash(augmentedPath).Return(wslPath)
803+
c := mocks.NewCommand(ctrl)
804+
ncc.EXPECT().Create("shell", "--workdir", wslPath, limaInstanceName, "sudo", "-E", nerdctlCmdName, "container", "run",
805+
"-p", "8080:8080", "--name", "myContainer", "--interactive=true", "--detach", "--rm=true",
806+
"--init=false", "--tty=true", "--debug-full", "false", "--sig-proxy=0",
807+
"--experimental", "false", "--oom-kill-disable=false", "--read-only=false",
808+
"--privileged=false", "-e", "ARG1=val1", "alpine:latest", "env").Return(c)
809+
c.EXPECT().Run()
810+
},
811+
},
772812
}
773813

774814
for _, tc := range testCases {

0 commit comments

Comments
 (0)