Skip to content

Commit

Permalink
Use prefix naming for events test
Browse files Browse the repository at this point in the history
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
  • Loading branch information
LK4D4 committed Sep 19, 2014
1 parent aa536b2 commit 9720078
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion integration-cli/docker_api_events_test.go
Expand Up @@ -9,7 +9,7 @@ import (
"time"
)

func TestGetEventsLineDelim(t *testing.T) {
func TestEventsApiGetLineDelim(t *testing.T) {
name := "testimageevents"
defer deleteImages(name)
_, err := buildImage(name,
Expand Down
10 changes: 5 additions & 5 deletions integration-cli/docker_cli_events_test.go
Expand Up @@ -9,7 +9,7 @@ import (
"time"
)

func TestCLIGetEventsUntag(t *testing.T) {
func TestEventsUntag(t *testing.T) {
out, _, _ := cmd(t, "images", "-q")
image := strings.Split(out, "\n")[0]
cmd(t, "tag", image, "utest:tag1")
Expand All @@ -31,7 +31,7 @@ func TestCLIGetEventsUntag(t *testing.T) {
logDone("events - untags are logged")
}

func TestCLIGetEventsPause(t *testing.T) {
func TestEventsPause(t *testing.T) {
out, _, _ := cmd(t, "images", "-q")
image := strings.Split(out, "\n")[0]
cmd(t, "run", "-d", "--name", "testeventpause", image, "sleep", "2")
Expand All @@ -57,7 +57,7 @@ func TestCLIGetEventsPause(t *testing.T) {
logDone("events - pause/unpause is logged")
}

func TestCLILimitEvents(t *testing.T) {
func TestEventsLimit(t *testing.T) {
for i := 0; i < 30; i++ {
cmd(t, "run", "busybox", "echo", strconv.Itoa(i))
}
Expand All @@ -71,7 +71,7 @@ func TestCLILimitEvents(t *testing.T) {
logDone("events - limited to 64 entries")
}

func TestCLIGetEventsContainerEvents(t *testing.T) {
func TestEventsContainerEvents(t *testing.T) {
cmd(t, "run", "--rm", "busybox", "true")
eventsCmd := exec.Command(dockerBinary, "events", "--since=0", fmt.Sprintf("--until=%d", time.Now().Unix()))
out, exitCode, err := runCommandWithOutput(eventsCmd)
Expand Down Expand Up @@ -103,7 +103,7 @@ func TestCLIGetEventsContainerEvents(t *testing.T) {
logDone("events - container create, start, die, destroy is logged")
}

func TestCLIGetEventsImageUntagDelete(t *testing.T) {
func TestEventsImageUntagDelete(t *testing.T) {
name := "testimageevents"
defer deleteImages(name)
_, err := buildImage(name,
Expand Down

0 comments on commit 9720078

Please sign in to comment.