Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

daemon/stats: remove obnoxious types file #36494

Merged
merged 1 commit into from Mar 6, 2018

Conversation

@stevvooe
Copy link
Contributor

stevvooe commented Mar 6, 2018

While a types.go file is handly when there are a lot of record types,
it is completely obnoxious when used for concrete, utility types with a
struct, new function and method set in the same file. This change
removes the types.go file in favor of the simpler approach.

Signed-off-by: Stephen J Day stephen.day@docker.com

While a `types.go` file is handly when there are a lot of record types,
it is completely obnoxious when used for concrete, utility types with a
struct, new function and method set in the same file. This change
removes the `types.go` file in favor of the simpler approach.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Copy link
Member

thaJeztah left a comment

LGTM

ping @vdemeester

@thaJeztah

This comment has been minimized.

Copy link
Member

thaJeztah commented Mar 6, 2018

This one is flaky on PowerPC;

01:46:41 ----------------------------------------------------------------------
01:46:41 FAIL: docker_cli_swarm_test.go:1377: DockerSwarmSuite.TestSwarmClusterRotateUnlockKey
01:46:41 
01:46:41 [d1e3bb6e78b37] waiting for daemon to start
01:46:41 [d1e3bb6e78b37] daemon started
01:46:41 
01:46:41 [def4242508b0e] waiting for daemon to start
01:46:41 [def4242508b0e] daemon started
01:46:41 
01:46:41 [d6e7e7ad58dea] waiting for daemon to start
01:46:41 [d6e7e7ad58dea] daemon started
01:46:41 
01:46:41 [def4242508b0e] exiting daemon
01:46:41 [def4242508b0e] waiting for daemon to start
01:46:41 [def4242508b0e] daemon started
01:46:41 
01:46:41 [d6e7e7ad58dea] exiting daemon
01:46:41 [d6e7e7ad58dea] waiting for daemon to start
01:46:41 [d6e7e7ad58dea] daemon started
01:46:41 
01:46:41 [def4242508b0e] exiting daemon
01:46:41 [def4242508b0e] waiting for daemon to start
01:46:41 [def4242508b0e] daemon started
01:46:41 
01:46:41 docker_cli_swarm_test.go:1439:
01:46:41     result.Assert(c, icmd.Expected{
01:46:41         ExitCode: 1,
01:46:41         Err:      "invalid key",
01:46:41     })
01:46:41 /go/src/github.com/docker/docker/vendor/github.com/gotestyourself/gotestyourself/icmd/command.go:65:
01:46:41     t.Fatalf(err.Error() + "\n")
01:46:41 ... Error: 
01:46:41 Command:  /usr/local/bin/docker --host unix:///tmp/docker-integration/def4242508b0e.sock swarm unlock
01:46:41 ExitCode: 0
01:46:41 Error:    <nil>
01:46:41 Stdout:   
01:46:41 Stderr:   
01:46:41 
01:46:41 Failures:
01:46:41 ExitCode was 0 expected 1
01:46:41 Expected stderr to contain "invalid key"
01:46:41 
01:46:41 
01:46:41 [d1e3bb6e78b37] exiting daemon
01:46:41 [def4242508b0e] exiting daemon
01:46:41 [d6e7e7ad58dea] exiting daemon
01:46:46 
Copy link
Member

vdemeester left a comment

LGTM 🐯

@codecov

This comment has been minimized.

Copy link

codecov bot commented Mar 6, 2018

Codecov Report

❗️ No coverage uploaded for pull request base (master@3e1505e). Click here to learn what that means.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master   #36494   +/-   ##
=========================================
  Coverage          ?   34.89%           
=========================================
  Files             ?      613           
  Lines             ?    45409           
  Branches          ?        0           
=========================================
  Hits              ?    15844           
  Misses            ?    27463           
  Partials          ?     2102
@yongtang yongtang merged commit 4db41f1 into moby:master Mar 6, 2018
8 checks passed
8 checks passed
codecov/patch Coverage not affected.
Details
codecov/project No report found to compare against
Details
dco-signed All commits are signed
experimental Jenkins build Docker-PRs-experimental 39644 has succeeded
Details
janky Jenkins build Docker-PRs 48390 has succeeded
Details
powerpc Jenkins build Docker-PRs-powerpc 8846 has succeeded
Details
windowsRS1 Jenkins build Docker-PRs-WoW-RS1 19898 has succeeded
Details
z Jenkins build Docker-PRs-s390x 8778 has succeeded
Details
@stevvooe stevvooe deleted the stevvooe:remove-unnecessary-types-file branch Mar 7, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.