Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[18.03] Fix TestAttachAfterDetach to work with latest client#439

Merged
andrewhsu merged 1 commit intodocker-archive:18.03from
andrewhsu:taad
Feb 22, 2018
Merged

[18.03] Fix TestAttachAfterDetach to work with latest client#439
andrewhsu merged 1 commit intodocker-archive:18.03from
andrewhsu:taad

Conversation

@andrewhsu
Copy link
Copy Markdown
Contributor

seeing errors in the 18.03 codebase:

panic: DockerSuite.TestAttachAfterDetach test timed out after 5m0s [recovered]
	panic: DockerSuite.TestAttachAfterDetach test timed out after 5m0s

backport of:

with cherry-pick:

$ git cherry-pick -s -x 847b610

no conflicts

Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 847b610)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@andrewhsu andrewhsu added this to the 18.03.0 milestone Feb 22, 2018
@andrewhsu andrewhsu requested a review from dnephin February 22, 2018 01:55
Copy link
Copy Markdown

@jose-bigio jose-bigio left a comment

Choose a reason for hiding this comment

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

LGTM

@andrewhsu
Copy link
Copy Markdown
Contributor Author

Looks like this fixes the test:

PASS: docker_cli_attach_unix_test.go:62: DockerSuite.TestAttachAfterDetach	1.609s

@andrewhsu andrewhsu merged commit 9d7d57c into docker-archive:18.03 Feb 22, 2018
@andrewhsu andrewhsu deleted the taad branch February 22, 2018 02:30
docker-jenkins pushed a commit that referenced this pull request Jan 23, 2020
[19.03] Bump 19.03 libnetwork refpoint
Upstream-commit: 78571e9049b13803d07bada325a6bd1925d96227
Component: engine
docker-jenkins pushed a commit that referenced this pull request Mar 5, 2020
Bump buildx to master to check if it builds on the CI
Upstream-commit: 13e9501
Component: packaging
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
…ker-archive#435)

* * Verification scripts for rpm
* Verification scripts for deb
* Integrated verify step in release-packaging Jenkinsfile

Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com>

* Merge pull request docker-archive#439 from seemethere/remove_f31

[ce-19.03] ci: Remove fedora 31 arm64

* Revert "Merge pull request docker-archive#439 from seemethere/remove_f31"

This reverts commit 700e7a6b75938d96ab587b889077ec6a3dec9963, reversing
changes made to caa1930f1f60c52afccd1ff06882c6e7c2200440.

* [ce-19.03] ci: Re-add saveS3 (docker-archive#437)

[ce-19.03] ci: Re-add saveS3
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
…x-master

Bump buildx to master to check if it builds on the CI
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants