mirror of
https://github.com/containers/podman.git
synced 2025-12-11 01:11:30 +08:00
Fix spelling "setup" -> "set up" and similar
* Replace "setup", "lookup", "cleanup", "backup" with "set up", "look up", "clean up", "back up" when used as verbs. Replace also variations of those. * Improve language in a few places. Signed-off-by: Erik Sjölund <erik.sjolund@gmail.com>
This commit is contained in:
@@ -322,7 +322,7 @@ func PodmanTestCreateUtil(tempDir string, remote bool) *PodmanTestIntegration {
|
||||
}
|
||||
}
|
||||
|
||||
// Setup registries.conf ENV variable
|
||||
// Set up registries.conf ENV variable
|
||||
p.setDefaultRegistriesConfigEnv()
|
||||
// Rewrite the PodmanAsUser function
|
||||
p.PodmanMakeOptions = p.makeOptions
|
||||
|
||||
@@ -25,7 +25,7 @@ var _ = Describe("Podman create with --ip flag", func() {
|
||||
}
|
||||
podmanTest = PodmanTestCreate(tempdir)
|
||||
podmanTest.Setup()
|
||||
// Cleanup the CNI networks used by the tests
|
||||
// Clean up the CNI networks used by the tests
|
||||
os.RemoveAll("/var/lib/cni/networks/podman")
|
||||
})
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ var _ = Describe("Podman run with --mac-address flag", func() {
|
||||
}
|
||||
podmanTest = PodmanTestCreate(tempdir)
|
||||
podmanTest.Setup()
|
||||
// Cleanup the CNI networks used by the tests
|
||||
// Clean up the CNI networks used by the tests
|
||||
os.RemoveAll("/var/lib/cni/networks/podman")
|
||||
})
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ var _ = Describe("Podman run with --ip flag", func() {
|
||||
}
|
||||
podmanTest = PodmanTestCreate(tempdir)
|
||||
podmanTest.Setup()
|
||||
// Cleanup the CNI networks used by the tests
|
||||
// Clean up the CNI networks used by the tests
|
||||
os.RemoveAll("/var/lib/cni/networks/podman")
|
||||
})
|
||||
|
||||
|
||||
@@ -247,7 +247,7 @@ var _ = Describe("podman system connection", func() {
|
||||
// podman-remote commands will be executed by ginkgo directly.
|
||||
SkipIfContainerized("sshd is not available when running in a container")
|
||||
SkipIfRemote("connection heuristic requires both podman and podman-remote binaries")
|
||||
SkipIfNotRootless(fmt.Sprintf("FIXME: setup ssh keys when root. uid(%d) euid(%d)", os.Getuid(), os.Geteuid()))
|
||||
SkipIfNotRootless(fmt.Sprintf("FIXME: set up ssh keys when root. uid(%d) euid(%d)", os.Getuid(), os.Geteuid()))
|
||||
SkipIfSystemdNotRunning("cannot test connection heuristic if systemd is not running")
|
||||
SkipIfNotActive("sshd", "cannot test connection heuristic if sshd is not running")
|
||||
})
|
||||
|
||||
@@ -37,7 +37,7 @@ func NilFunc(f *TestFramework) error {
|
||||
func (t *TestFramework) Setup() {
|
||||
// Global initialization for the whole framework goes in here
|
||||
|
||||
// Setup the actual test suite
|
||||
// Set up the actual test suite
|
||||
gomega.Expect(t.setup(t)).To(gomega.Succeed())
|
||||
}
|
||||
|
||||
|
||||
@@ -359,7 +359,7 @@ load helpers
|
||||
run curl -s $SERVER/index.txt
|
||||
is "$output" "$random_1" "curl 127.0.0.1:/index.txt"
|
||||
|
||||
# cleanup the container
|
||||
# clean up the container
|
||||
run_podman rm -t 0 -f $cid
|
||||
|
||||
# test that we cannot remove the default network
|
||||
@@ -549,7 +549,7 @@ load helpers
|
||||
run curl --max-time 3 -s $SERVER/index.txt
|
||||
is "$output" "$random_1" "curl 127.0.0.1:/index.txt should still work"
|
||||
|
||||
# cleanup
|
||||
# clean up
|
||||
run_podman rm -t 0 -f $cid $background_cid
|
||||
run_podman network rm -t 0 -f $netname $netname2
|
||||
}
|
||||
@@ -622,7 +622,7 @@ load helpers
|
||||
run_podman rm -t 0 -f $cid
|
||||
done
|
||||
|
||||
# Cleanup network
|
||||
# Clean up network
|
||||
run_podman network rm -t 0 -f $netname
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user