Skip to content

[tests] Clean up unremoved temp files from manager raft tests.#2271

Merged
aaronlehmann merged 1 commit intomoby:masterfrom
cyli:test-tmpfiles
Jun 21, 2017
Merged

[tests] Clean up unremoved temp files from manager raft tests.#2271
aaronlehmann merged 1 commit intomoby:masterfrom
cyli:test-tmpfiles

Conversation

@cyli
Copy link
Copy Markdown
Contributor

@cyli cyli commented Jun 20, 2017

We were altering the node map during the tests, so some of the replaced nodes didn't get cleaned up. See #2269 (comment)


go nodes[2].Run(ctx)
raftutils.AddRaftNode(t, clockSource, nodes, tc, raft.NodeOptions{JoinAddr: nodes[1].Address})
defer raftutils.TeardownCluster(nodes)
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this defer be moved above to where nodes is created?

3: nodes[3],
}
raftutils.TeardownCluster(toClean)
raftutils.ShutdownNode(nodes[2])
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now the for loop above only needs to act on node 1.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated the above for loop to just shutdown the first node.

@codecov
Copy link
Copy Markdown

codecov bot commented Jun 20, 2017

Codecov Report

Merging #2271 into master will increase coverage by 0.02%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #2271      +/-   ##
==========================================
+ Coverage   60.33%   60.36%   +0.02%     
==========================================
  Files         125      125              
  Lines       20394    20394              
==========================================
+ Hits        12304    12310       +6     
+ Misses       6698     6689       -9     
- Partials     1392     1395       +3

Signed-off-by: Ying Li <ying.li@docker.com>
@aaronlehmann
Copy link
Copy Markdown
Collaborator

LGTM

@aaronlehmann aaronlehmann merged commit ae71b30 into moby:master Jun 21, 2017
@cyli cyli deleted the test-tmpfiles branch June 21, 2017 01:05
andrewhsu pushed a commit to docker-archive/docker-ce that referenced this pull request Jul 14, 2017
- moby/swarmkit#2266 (support for templating Node.Hostname in docker executor)
- moby/swarmkit#2281 (change restore action on objects to be update, not delete/create)
- moby/swarmkit#2285 (extend watch queue with timeout and size limit)
- moby/swarmkit#2253 (version-aware failure tracking in the scheduler)
- moby/swarmkit#2275 (update containerd and port executor to container client library)
- moby/swarmkit#2292 (rename some generic resources)
- moby/swarmkit#2300 (limit the size of the external CA response)
- moby/swarmkit#2301 (delete global tasks when the node running them is deleted)

Minor cleanups, dependency bumps, and vendoring:
- moby/swarmkit#2271
- moby/swarmkit#2279
- moby/swarmkit#2283
- moby/swarmkit#2282
- moby/swarmkit#2274
- moby/swarmkit#2296 (dependency bump of etcd, go-winio)

Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: 4509a00
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/engine-extract that referenced this pull request Mar 16, 2020
- moby/swarmkit#2266 (support for templating Node.Hostname in docker executor)
- moby/swarmkit#2281 (change restore action on objects to be update, not delete/create)
- moby/swarmkit#2285 (extend watch queue with timeout and size limit)
- moby/swarmkit#2253 (version-aware failure tracking in the scheduler)
- moby/swarmkit#2275 (update containerd and port executor to container client library)
- moby/swarmkit#2292 (rename some generic resources)
- moby/swarmkit#2300 (limit the size of the external CA response)
- moby/swarmkit#2301 (delete global tasks when the node running them is deleted)

Minor cleanups, dependency bumps, and vendoring:
- moby/swarmkit#2271
- moby/swarmkit#2279
- moby/swarmkit#2283
- moby/swarmkit#2282
- moby/swarmkit#2274
- moby/swarmkit#2296 (dependency bump of etcd, go-winio)

Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: 4509a00
Component: engine
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants