mirror of
https://github.com/clearlinux/docker.git
synced 2026-09-06 13:41:36 +00:00
typofix - https://github.com/vlajos/misspell_fixer
Signed-off-by: Veres Lajos <vlajos@gmail.com>
This commit is contained in:
@@ -1804,8 +1804,8 @@ func (s *DockerSuite) TestBuildForceRm(c *check.C) {
|
||||
// * Run a 1-year-long sleep from a docker build.
|
||||
// * When docker events sees container start, close the "docker build" command
|
||||
// * Wait for docker events to emit a dying event.
|
||||
func (s *DockerSuite) TestBuildCancelationKillsSleep(c *check.C) {
|
||||
name := "testbuildcancelation"
|
||||
func (s *DockerSuite) TestBuildCancellationKillsSleep(c *check.C) {
|
||||
name := "testbuildcancellation"
|
||||
|
||||
// (Note: one year, will never finish)
|
||||
ctx, err := fakeContext("FROM busybox\nRUN sleep 31536000", nil)
|
||||
|
||||
@@ -306,7 +306,7 @@ func (s *DockerSuite) TestCpFromSymlinkToDirectory(c *check.C) {
|
||||
os.Remove(expectedPath)
|
||||
|
||||
// This copy command should resolve the symlink (note the trailing
|
||||
// seperator), copying the target into the temporary directory.
|
||||
// separator), copying the target into the temporary directory.
|
||||
dockerCmd(c, "cp", cleanedContainerID+":"+"/dir_link/", testDir)
|
||||
|
||||
// It *should not* have copied the directory using the target's name, but
|
||||
@@ -397,7 +397,7 @@ func (s *DockerSuite) TestCpToSymlinkToDirectory(c *check.C) {
|
||||
os.Remove(expectedPath)
|
||||
|
||||
// This copy command should resolve the symlink (note the trailing
|
||||
// seperator), copying the target into the test volume directory in the
|
||||
// separator), copying the target into the test volume directory in the
|
||||
// container.
|
||||
dockerCmd(c, "cp", localLink+"/", cleanedContainerID+":/testVol")
|
||||
|
||||
|
||||
@@ -633,7 +633,7 @@ func (s *DockerDaemonSuite) TestDaemonBridgeIP(c *check.C) {
|
||||
// 3. Check if the bip config has taken effect using ifconfig and iptables commands
|
||||
// 4. Launch a Container and make sure the IP-Address is in the expected subnet
|
||||
// 5. Delete the docker0 Bridge
|
||||
// 6. Restart the Docker Daemon (via defered action)
|
||||
// 6. Restart the Docker Daemon (via deferred action)
|
||||
// This Restart takes care of bringing docker0 interface back to auto-assigned IP
|
||||
|
||||
defaultNetworkBridge := "docker0"
|
||||
|
||||
@@ -20,7 +20,7 @@ func (s *DockerSuite) TestEventsTimestampFormats(c *check.C) {
|
||||
image := "busybox"
|
||||
|
||||
// Start stopwatch, generate an event
|
||||
time.Sleep(time.Second) // so that we don't grab events from previous test occured in the same second
|
||||
time.Sleep(time.Second) // so that we don't grab events from previous test occurred in the same second
|
||||
start := daemonTime(c)
|
||||
time.Sleep(time.Second) // remote API precision is only a second, wait a while before creating an event
|
||||
dockerCmd(c, "tag", image, "timestamptest:1")
|
||||
|
||||
@@ -184,7 +184,7 @@ func (s *DockerSuite) TestLogsSince(c *check.C) {
|
||||
out, _ := dockerCmd(c, "run", "--name="+name, "busybox", "/bin/sh", "-c", "for i in $(seq 1 3); do sleep 2; echo `date +%s` log$i; done")
|
||||
|
||||
log2Line := strings.Split(strings.Split(out, "\n")[1], " ")
|
||||
t, err := strconv.ParseInt(log2Line[0], 10, 64) // the timestamp log2 is writen
|
||||
t, err := strconv.ParseInt(log2Line[0], 10, 64) // the timestamp log2 is written
|
||||
c.Assert(err, check.IsNil)
|
||||
since := t + 1 // add 1s so log1 & log2 doesn't show up
|
||||
out, _ = dockerCmd(c, "logs", "-t", fmt.Sprintf("--since=%v", since), name)
|
||||
|
||||
@@ -1032,7 +1032,7 @@ func (s *DockerSuite) TestRunDnsOptionsBasedOnHostResolvConf(c *check.C) {
|
||||
}
|
||||
|
||||
// Test to see if a non-root user can resolve a DNS name and reach out to it. Also
|
||||
// check if the container resolv.conf file has atleast 0644 perm.
|
||||
// check if the container resolv.conf file has at least 0644 perm.
|
||||
func (s *DockerSuite) TestRunNonRootUserResolvName(c *check.C) {
|
||||
testRequires(c, SameHostDaemon, Network)
|
||||
|
||||
@@ -1050,7 +1050,7 @@ func (s *DockerSuite) TestRunNonRootUserResolvName(c *check.C) {
|
||||
}
|
||||
|
||||
if (finfo.Mode() & fmode) != fmode {
|
||||
c.Fatalf("Expected container resolv.conf mode to be atleast %s, instead got %s", fmode.String(), finfo.Mode().String())
|
||||
c.Fatalf("Expected container resolv.conf mode to be at least %s, instead got %s", fmode.String(), finfo.Mode().String())
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -105,7 +105,7 @@ func (s *DockerSuite) TestTagWithPrefixHyphen(c *check.C) {
|
||||
if err == nil || !strings.Contains(out, "repository name component must match") {
|
||||
c.Fatal("tag a name begin with '-' should failed")
|
||||
}
|
||||
// test index name begin wiht '-'
|
||||
// test index name begin with '-'
|
||||
out, _, err = dockerCmdWithError("tag", "busybox:latest", "-index:5000/busybox:test")
|
||||
if err == nil || !strings.Contains(out, "Invalid index name (-index:5000). Cannot begin or end with a hyphen") {
|
||||
c.Fatal("tag a name begin with '-' should failed")
|
||||
|
||||
@@ -32,7 +32,7 @@ import (
|
||||
// Daemon represents a Docker daemon for the testing framework.
|
||||
type Daemon struct {
|
||||
// Defaults to "daemon"
|
||||
// Useful to set to --daemon or -d for checking backwards compatability
|
||||
// Useful to set to --daemon or -d for checking backwards compatibility
|
||||
Command string
|
||||
GlobalFlags []string
|
||||
|
||||
|
||||
Reference in New Issue
Block a user