opensource/rkt
1
0
Fork 0
mirror of https://github.com/rkt/rkt.git synced 2026-03-13 09:40:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix some misspells in inspect.go

Browse Source 
Signed-off-by: zhoulin xie <zhoulin.xie@daocloud.io>
This commit is contained in:
zhoulin xie
2019-03-10 20:39:06 +08:00
parent 239c27832e
commit ce3f6ea551
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/inspect/inspect.go
View File

@@ -94,7 +94,7 @@ func init() {
globalFlagset.BoolVar(&globalFlags.ReadStdin, "read-stdin", false, "Read a line from stdin")
globalFlagset.BoolVar(&globalFlags.CheckTty, "check-tty", false, "Check if stdin is a terminal")
globalFlagset.BoolVar(&globalFlags.CheckPath, "check-path", false, "Check if environment variable PATH does not contain \\n")
globalFlagset.BoolVar(&globalFlags.PrintExec, "print-exec", false, "Print the command we were execed as (i.e. argv[0])")
globalFlagset.BoolVar(&globalFlags.PrintExec, "print-exec", false, "Print the command we were exceed as (i.e. argv[0])")
globalFlagset.StringVar(&globalFlags.PrintMsg, "print-msg", "", "Print the message given as parameter")
globalFlagset.StringVar(&globalFlags.SuffixMsg, "suffix-msg", "", "Print this suffix after some commands")
globalFlagset.BoolVar(&globalFlags.PrintCwd, "print-cwd", false, "Print the current working directory")
@@ -262,7 +262,7 @@ func main() {
}
if globalFlags.PrintExec {
fmt.Fprintf(os.Stdout, "inspect execed as: %s\n", os.Args[0])
fmt.Fprintf(os.Stdout, "inspect exceed as: %s\n", os.Args[0])
}
if globalFlags.PrintMsg != "" {

12
tests/rkt_exec_test.go
View File

@@ -66,23 +66,23 @@ func TestRunOverrideExec(t *testing.T) {
{
// Sanity check - make sure no --exec override prints the expected exec invocation
rktCmd: fmt.Sprintf("%s --insecure-options=image run --mds-register=false %s -- --print-exec", ctx.Cmd(), execImage),
expectedRegex: "inspect execed as: /inspect",
expectedRegex: "inspect exceed as: /inspect",
},
{
// Now test overriding the entrypoint (which is a symlink to /inspect so should behave identically)
rktCmd: fmt.Sprintf("%s --insecure-options=image run --mds-register=false %s --exec /inspect-link -- --print-exec", ctx.Cmd(), execImage),
expectedRegex: "inspect execed as: /inspect-link",
expectedRegex: "inspect exceed as: /inspect-link",
},
{
// Test overriding the entrypoint with a relative path
rktCmd: fmt.Sprintf("%s --insecure-options=image run --mds-register=false %s --exec inspect-link-bin -- --print-exec", ctx.Cmd(), execImage),
expectedRegex: "inspect execed as: .*inspect-link-bin",
expectedRegex: "inspect exceed as: .*inspect-link-bin",
},
{
// Test overriding the entrypoint with a missing app section
rktCmd: fmt.Sprintf("%s --insecure-options=image run --mds-register=false %s --exec /inspect -- --print-exec", ctx.Cmd(), noappImage),
expectedRegex: "inspect execed as: /inspect",
expectedRegex: "inspect exceed as: /inspect",
},
} {
runRktAndCheckRegexOutput(t, tt.rktCmd, tt.expectedRegex)
@@ -102,7 +102,7 @@ func TestRunPreparedOverrideExec(t *testing.T) {
uuid = runRktAndGetUUID(t, rktCmd)
rktCmd = fmt.Sprintf("%s run-prepared --mds-register=false %s", ctx.Cmd(), uuid)
expected = "inspect execed as: /inspect"
expected = "inspect exceed as: /inspect"
runRktAndCheckOutput(t, rktCmd, expected, false)
// Now test overriding the entrypoint (which is a symlink to /inspect so should behave identically)
@@ -110,6 +110,6 @@ func TestRunPreparedOverrideExec(t *testing.T) {
uuid = runRktAndGetUUID(t, rktCmd)
rktCmd = fmt.Sprintf("%s run-prepared --mds-register=false %s", ctx.Cmd(), uuid)
expected = "inspect execed as: /inspect-link"
expected = "inspect exceed as: /inspect-link"
runRktAndCheckOutput(t, rktCmd, expected, false)
}