Skip to content

Commit

Permalink
Merge 2c01995 into fce9a6f
Browse files Browse the repository at this point in the history
  • Loading branch information
@aeneasr
aeneasr committed Aug 10, 2020
2 parents fce9a6f + 2c01995 commit 9685c9e
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 41 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Expand Up @@ -6,7 +6,7 @@ services:
- docker

go:
- 1.13
- 1.14

before_install:
- go get github.com/mattn/goveralls github.com/sonatype-nexus-community/nancy
Expand Down
80 changes: 40 additions & 40 deletions dockertest_test.go
View file
Expand Up @@ -32,7 +32,7 @@ func TestMain(m *testing.M) {

func TestPostgres(t *testing.T) {
resource, err := pool.Run("postgres", "9.5", nil)
require.Nil(t, err)
require.NoError(t, err)
assert.NotEmpty(t, resource.GetPort("5432/tcp"))

assert.NotEmpty(t, resource.GetBoundIP("5432/tcp"))
Expand All @@ -44,8 +44,8 @@ func TestPostgres(t *testing.T) {
}
return db.Ping()
})
require.Nil(t, err)
require.Nil(t, pool.Purge(resource))
require.NoError(t, err)
require.NoError(t, pool.Purge(resource))
}

func TestMongo(t *testing.T) {
Expand All @@ -57,7 +57,7 @@ func TestMongo(t *testing.T) {
ExposedPorts: []string{"3000"},
}
resource, err := pool.RunWithOptions(options)
require.Nil(t, err)
require.NoError(t, err)
port := resource.GetPort("3000/tcp")
assert.NotEmpty(t, port)

Expand All @@ -74,8 +74,8 @@ func TestMongo(t *testing.T) {

return nil
})
require.Nil(t, err)
require.Nil(t, pool.Purge(resource))
require.NoError(t, err)
require.NoError(t, pool.Purge(resource))
}

func TestContainerWithName(t *testing.T) {
Expand All @@ -85,10 +85,10 @@ func TestContainerWithName(t *testing.T) {
Repository: "postgres",
Tag: "9.5",
})
require.Nil(t, err)
require.NoError(t, err)
assert.Equal(t, "/db", resource.Container.Name)

require.Nil(t, pool.Purge(resource))
require.NoError(t, pool.Purge(resource))
}

func TestContainerWithLabels(t *testing.T) {
Expand All @@ -102,10 +102,10 @@ func TestContainerWithLabels(t *testing.T) {
Tag: "9.5",
Labels: labels,
})
require.Nil(t, err)
require.NoError(t, err)
assert.EqualValues(t, labels, resource.Container.Config.Labels, "labels don't match")

require.Nil(t, pool.Purge(resource))
require.NoError(t, pool.Purge(resource))
}

func TestContainerWithPortBinding(t *testing.T) {
Expand All @@ -117,10 +117,10 @@ func TestContainerWithPortBinding(t *testing.T) {
"5432/tcp": {{HostIP: "", HostPort: "5433"}},
},
})
require.Nil(t, err)
require.NoError(t, err)
assert.Equal(t, "5433", resource.GetPort("5432/tcp"))

require.Nil(t, pool.Purge(resource))
require.NoError(t, pool.Purge(resource))
}

func TestBuildImage(t *testing.T) {
Expand All @@ -135,15 +135,15 @@ func TestBuildImage(t *testing.T) {
)

resource, err := pool.BuildAndRun("postgres-test", dockerfilePath, nil)
require.Nil(t, err)
require.NoError(t, err)

assert.Equal(t, "/postgres-test", resource.Container.Name)
require.Nil(t, pool.Purge(resource))
require.NoError(t, pool.Purge(resource))
}

func TestExpire(t *testing.T) {
resource, err := pool.Run("postgres", "9.5", nil)
require.Nil(t, err)
require.NoError(t, err)
assert.NotEmpty(t, resource.GetPort("5432/tcp"))

assert.NotEmpty(t, resource.GetBoundIP("5432/tcp"))
Expand All @@ -158,15 +158,15 @@ func TestExpire(t *testing.T) {
return nil
}
err = resource.Expire(1)
require.Nil(t, err)
require.NoError(t, err)
time.Sleep(5 * time.Second)
err = db.Ping()
require.NotNil(t, err)
return nil
})
require.Nil(t, err)
require.NoError(t, err)

require.Nil(t, pool.Purge(resource))
require.NoError(t, pool.Purge(resource))
}

func TestContainerWithShMzSize(t *testing.T) {
Expand All @@ -179,10 +179,10 @@ func TestContainerWithShMzSize(t *testing.T) {
}, func(hostConfig *dc.HostConfig) {
hostConfig.ShmSize = shmemsize
})
require.Nil(t, err)
require.NoError(t, err)
assert.EqualValues(t, shmemsize, resource.Container.HostConfig.ShmSize, "shmsize don't match")

require.Nil(t, pool.Purge(resource))
require.NoError(t, pool.Purge(resource))
}

func TestContainerByName(t *testing.T) {
Expand All @@ -192,14 +192,14 @@ func TestContainerByName(t *testing.T) {
Repository: "postgres",
Tag: "9.5",
})
require.Nil(t, err)
require.NoError(t, err)

want, ok := pool.ContainerByName("db")
require.True(t, ok)

require.Equal(t, got, want)

require.Nil(t, pool.Purge(got))
require.NoError(t, pool.Purge(got))
}

func TestRemoveContainerByName(t *testing.T) {
Expand All @@ -209,24 +209,24 @@ func TestRemoveContainerByName(t *testing.T) {
Repository: "postgres",
Tag: "9.5",
})
require.Nil(t, err)
require.NoError(t, err)

err = pool.RemoveContainerByName("db")
require.Nil(t, err)
require.NoError(t, err)

resource, err := pool.RunWithOptions(
&RunOptions{
Name: "db",
Repository: "postgres",
Tag: "9.5",
})
require.Nil(t, err)
require.Nil(t, pool.Purge(resource))
require.NoError(t, err)
require.NoError(t, pool.Purge(resource))
}

func TestExec(t *testing.T) {
resource, err := pool.Run("postgres", "9.5", nil)
require.Nil(t, err)
require.NoError(t, err)
assert.NotEmpty(t, resource.GetPort("5432/tcp"))
assert.NotEmpty(t, resource.GetBoundIP("5432/tcp"))

Expand All @@ -240,38 +240,38 @@ func TestExec(t *testing.T) {
}
return db.QueryRow("SHOW server_version").Scan(&pgVersion)
})
require.Nil(t, err)
require.NoError(t, err)

var stdout bytes.Buffer
exitCode, err := resource.Exec(
[]string{"psql", "-qtAX", "-U", "postgres", "-c", "SHOW server_version"},
ExecOptions{StdOut: &stdout},
)
require.Nil(t, err)
require.NoError(t, err)
require.Zero(t, exitCode)

require.Equal(t, pgVersion, strings.TrimRight(stdout.String(), "\n"))
}

func TestNetworking_on_start(t *testing.T) {
network, err := pool.CreateNetwork("test-on-start")
require.Nil(t, err)
require.NoError(t, err)
defer network.Close()

resourceFirst, err := pool.RunWithOptions(&RunOptions{
Repository: "postgres",
Tag: "9.5",
Networks: []*Network{network},
})
require.Nil(t, err)
require.NoError(t, err)
defer resourceFirst.Close()

resourceSecond, err := pool.RunWithOptions(&RunOptions{
Repository: "postgres",
Tag: "11",
Networks: []*Network{network},
})
require.Nil(t, err)
require.NoError(t, err)
defer resourceSecond.Close()

var expectedVersion string
Expand All @@ -288,27 +288,27 @@ func TestNetworking_on_start(t *testing.T) {
}
return db.QueryRow("SHOW server_version").Scan(&expectedVersion)
})
require.Nil(t, err)
require.NoError(t, err)
}

func TestNetworking_after_start(t *testing.T) {
network, err := pool.CreateNetwork("test-after-start")
require.Nil(t, err)
require.NoError(t, err)
defer network.Close()

resourceFirst, err := pool.Run("postgres", "9.6", nil)
require.Nil(t, err)
require.NoError(t, err)
defer resourceFirst.Close()

err = resourceFirst.ConnectToNetwork(network)
require.Nil(t, err)
require.NoError(t, err)

resourceSecond, err := pool.Run("postgres", "11", nil)
require.Nil(t, err)
require.NoError(t, err)
defer resourceSecond.Close()

err = resourceSecond.ConnectToNetwork(network)
require.Nil(t, err)
require.NoError(t, err)

var expectedVersion string
err = pool.Retry(func() error {
Expand All @@ -324,14 +324,14 @@ func TestNetworking_after_start(t *testing.T) {
}
return db.QueryRow("SHOW server_version").Scan(&expectedVersion)
})
require.Nil(t, err)
require.NoError(t, err)

var stdout bytes.Buffer
exitCode, err := resourceFirst.Exec(
[]string{"psql", "-qtAX", "-h", resourceSecond.GetIPInNetwork(network), "-U", "postgres", "-c", "SHOW server_version"},
ExecOptions{StdOut: &stdout},
)
require.Nil(t, err)
require.NoError(t, err)
require.Zero(t, exitCode)

require.Equal(t, expectedVersion, strings.TrimRight(stdout.String(), "\n"))
Expand Down

0 comments on commit 9685c9e

Please sign in to comment.