kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #40112 from thaJeztah/cut_the_noise

Browse source 
integration-cli: don't log "Creating new daemon" logs, and print correct line numbers
This commit is contained in:
Tibor Vass 2019-10-24 11:24:24 -07:00 • committed by GitHub
commit 2cf86a03a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
integration-cli/check_test.go
View file

@ -349,6 +349,7 @@ func (s *DockerSwarmSuite) SetUpTest(c *testing.T) {
} }
func (s *DockerSwarmSuite) AddDaemon(c *testing.T, joinSwarm, manager bool) *daemon.Daemon { func (s *DockerSwarmSuite) AddDaemon(c *testing.T, joinSwarm, manager bool) *daemon.Daemon {
c.Helper()
d := daemon.New(c, dockerBinary, dockerdBinary, d := daemon.New(c, dockerBinary, dockerdBinary,
testdaemon.WithEnvironment(testEnv.Execution), testdaemon.WithEnvironment(testEnv.Execution),
testdaemon.WithSwarmPort(defaultSwarmPort+s.portIndex), testdaemon.WithSwarmPort(defaultSwarmPort+s.portIndex),

6
integration-cli/daemon/daemon.go
View file

@ -22,6 +22,7 @@ type Daemon struct {
// This will create a directory such as d123456789 in the folder specified by $DOCKER_INTEGRATION_DAEMON_DEST or $DEST. // This will create a directory such as d123456789 in the folder specified by $DOCKER_INTEGRATION_DAEMON_DEST or $DEST.
// The daemon will not automatically start. // The daemon will not automatically start.
func New(t testing.TB, dockerBinary string, dockerdBinary string, ops ...daemon.Option) *Daemon { func New(t testing.TB, dockerBinary string, dockerdBinary string, ops ...daemon.Option) *Daemon {
t.Helper()
ops = append(ops, daemon.WithDockerdBinary(dockerdBinary)) ops = append(ops, daemon.WithDockerdBinary(dockerdBinary))
d := daemon.New(t, ops...) d := daemon.New(t, ops...)
return &Daemon{ return &Daemon{
@ -78,9 +79,10 @@ func (d *Daemon) inspectFieldWithError(name, field string) (string, error) {
// CheckActiveContainerCount returns the number of active containers // CheckActiveContainerCount returns the number of active containers
// FIXME(vdemeester) should re-use ActivateContainers in some way // FIXME(vdemeester) should re-use ActivateContainers in some way
func (d *Daemon) CheckActiveContainerCount(c *testing.T) (interface{}, string) { func (d *Daemon) CheckActiveContainerCount(t *testing.T) (interface{}, string) {
t.Helper()
out, err := d.Cmd("ps", "-q") out, err := d.Cmd("ps", "-q")
assert.NilError(c, err) assert.NilError(t, err)
if len(strings.TrimSpace(out)) == 0 { if len(strings.TrimSpace(out)) == 0 {
return 0, "" return 0, ""
} }

3
testutil/daemon/daemon.go
View file

@ -148,9 +148,8 @@ func New(t testing.TB, ops ...Option) *Daemon {
assert.Check(t, dest != "", "Please set the DOCKER_INTEGRATION_DAEMON_DEST or the DEST environment variable") assert.Check(t, dest != "", "Please set the DOCKER_INTEGRATION_DAEMON_DEST or the DEST environment variable")
t.Logf("Creating a new daemon at: %q", dest)
d, err := NewDaemon(dest, ops...) d, err := NewDaemon(dest, ops...)
assert.NilError(t, err, "could not create daemon") assert.NilError(t, err, "could not create daemon at %q", dest)
return d return d
} }