Skip to content

Regenerate protobuf for 3.5#2451

Merged
anshulpundir merged 1 commit intomoby:masterfrom
thaJeztah:regenerate-protobuf-for-3.5
Nov 21, 2017
Merged

Regenerate protobuf for 3.5#2451
anshulpundir merged 1 commit intomoby:masterfrom
thaJeztah:regenerate-protobuf-for-3.5

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Nov 17, 2017

Protobuf was updated to version 3.5, in commit
9b981e2 (#2448), but files were not regenerated.

These are the changes after running make generate after installing protobuf 3.5

Relates to #2444

ping @dperny @stevvooe @anshulpundir

@thaJeztah thaJeztah mentioned this pull request Nov 17, 2017
Merged
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Nov 17, 2017

Also wondering if we can have a check in CI catching this

@thaJeztah thaJeztah mentioned this pull request Nov 17, 2017
Merged
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Nov 17, 2017

CI is failing on flaky test; #2445

2017-11-17 13:12:02.650232 I | http: TLS handshake error from 127.0.0.1:53797: remote error: tls: bad certificate
2017-11-17 13:12:02.692636 I | http: TLS handshake error from 127.0.0.1:48260: remote error: tls: bad certificate
2017-11-17 13:12:02.747638 I | http: TLS handshake error from 127.0.0.1:48261: remote error: tls: bad certificate
--- FAIL: TestUpdateNodeDemote (10.94s)
	Error Trace:	node_test.go:592
			node_test.go:732
	Error:		Received unexpected error expected node 3 to be unreachable
			polling failed
			github.com/docker/swarmkit/testutils.PollFuncWithTimeout
				/home/ubuntu/.go_workspace/src/github.com/docker/swarmkit/testutils/poll.go:28
			github.com/docker/swarmkit/testutils.PollFunc
				/home/ubuntu/.go_workspace/src/github.com/docker/swarmkit/testutils/poll.go:36
			github.com/docker/swarmkit/manager/controlapi.testUpdateNodeDemote
				/home/ubuntu/.go_workspace/src/github.com/docker/swarmkit/manager/controlapi/node_test.go:592
			github.com/docker/swarmkit/manager/controlapi.TestUpdateNodeDemote
				/home/ubuntu/.go_workspace/src/github.com/docker/swarmkit/manager/controlapi/node_test.go:732
			testing.tRunner
				/usr/local/go/src/testing/testing.go:657
			runtime.goexit
				/usr/local/go/src/runtime/asm_amd64.s:2197
		

	Error Trace:	node_test.go:605
			node_test.go:732
	Error:		An error is expected but got nil.
		

	Error Trace:	node_test.go:606
			node_test.go:732
	Error:		Not equal: 0x9 (expected)
			        != 0x0 (actual)
		

FAIL

@thaJeztah thaJeztah force-pushed the regenerate-protobuf-for-3.5 branch from 341461a to e496790 Compare November 17, 2017 15:12
@codecov
Copy link
Copy Markdown

codecov bot commented Nov 17, 2017 •
edited
Loading

Codecov Report

Merging #2451 into master will decrease coverage by 5.87%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #2451      +/-   ##
==========================================
- Coverage   66.51%   60.63%   -5.88%     
==========================================
  Files          93      128      +35     
  Lines       17913    26412    +8499     
==========================================
+ Hits        11914    16016    +4102     
- Misses       5026     8986    +3960     
- Partials      973     1410     +437

@thaJeztah
Regenerate protobuf for 3.5
93c3290 
Protobuf was updated to version 3.5, in commit
9b981e2, but files were
not regenerated.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the regenerate-protobuf-for-3.5 branch from e496790 to 93c3290 Compare November 21, 2017 13:30
@nishanttotla
Copy link
Copy Markdown
Contributor

nishanttotla commented Nov 21, 2017

I'm curious how this relates to #2447. cc @anshulpundir

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Nov 21, 2017

#2447 re-generated with the previous version, so this is the same, but with the new (3.5) version #2448

@anshulpundir anshulpundir merged commit daac01b into moby:master Nov 21, 2017
@thaJeztah thaJeztah deleted the regenerate-protobuf-for-3.5 branch November 21, 2017 20:37
@andrewhsu andrewhsu mentioned this pull request Dec 5, 2017
Merged
This was referenced Feb 5, 2018
Merged
Merged
@thaJeztah thaJeztah mentioned this pull request Jul 8, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@nishanttotla nishanttotla nishanttotla approved these changes

@anshulpundir anshulpundir anshulpundir approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@thaJeztah @nishanttotla @anshulpundir