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

[18.01] skip DockerTrustSuite tests for 18.01#377

Merged
andrewhsu merged 2 commits intodocker-archive:18.01from
andrewhsu:tt
Jan 4, 2018
Merged

[18.01] skip DockerTrustSuite tests for 18.01#377
andrewhsu merged 2 commits intodocker-archive:18.01from
andrewhsu:tt

Conversation

@andrewhsu
Copy link
Copy Markdown
Contributor

@andrewhsu andrewhsu commented Jan 3, 2018

Seeing failures in DockerTrustSuite:

...
FAIL: docker_cli_build_test.go:4223: DockerTrustSuite.TestTrustedBuildTagFromReleasesRole
FAIL: docker_cli_build_test.go:4254: DockerTrustSuite.TestTrustedBuildTagIgnoresOtherDelegationRoles
FAIL: docker_cli_create_test.go:295: DockerTrustSuite.TestTrustedCreate
FAIL: docker_cli_create_test.go:331: DockerTrustSuite.TestTrustedCreateFromBadTrustServer
FAIL: docker_cli_create_test.go:321: DockerTrustSuite.TestTrustedIsolatedCreate
FAIL: docker_cli_pull_trusted_test.go:25: DockerTrustSuite.TestTrustedIsolatedPull
FAIL: docker_cli_pull_trusted_test.go:85: DockerTrustSuite.TestTrustedOfflinePull
FAIL: docker_cli_pull_trusted_test.go:14: DockerTrustSuite.TestTrustedPull
FAIL: docker_cli_pull_trusted_test.go:48: DockerTrustSuite.TestTrustedPullFromBadTrustServer
FAIL: docker_cli_pull_trusted_test.go:135: DockerTrustSuite.TestTrustedPullReadsFromReleasesRole
FAIL: docker_cli_push_test.go:284: DockerTrustSuite.TestTrustedPush
FAIL: docker_cli_push_test.go:368: DockerTrustSuite.TestTrustedPushWithIncorrectPassphraseForNonRoot
FAIL: docker_cli_run_test.go:3142: DockerTrustSuite.TestTrustedRun
FAIL: docker_cli_run_test.go:3171: DockerTrustSuite.TestTrustedRunFromBadTrustServer
...
OOPS: 20 passed, 14 FAILED
...

This PR will address it by ignoring those tests until they can be ported to the new testing thing.

This PR fixes the same notary mismatch issue from 17.10, 17.11, and 17.12 caused by updated stderr output from docker/cli#636 Fix stdout and errors in image/trust

This pr is duplicate of #344 [17.12] update trust tests for 17.12

With cherry-pick fbfeceb and d256539:

$ git cherry-pick -s -x fbfeceb d256539

No conflicts.

seemethere and others added 2 commits January 3, 2018 13:33
@seemethere @andrewhsu
Blacklist tests, will be rewritten later on
e357107 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 4e81e4f)
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
(cherry picked from commit ec6b0a1)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit fbfeceb)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@riyazdf @andrewhsu
update integration-cli tests for stderr output
5742bd3 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
(cherry picked from commit 250b84e)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit d256539)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@andrewhsu andrewhsu added this to the 18.01.0 milestone Jan 3, 2018
seemethere
seemethere approved these changes Jan 3, 2018
View reviewed changes
Copy link
Copy Markdown
Contributor

@seemethere seemethere 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 andrewhsu mentioned this pull request Jan 4, 2018
Merged
@andrewhsu andrewhsu merged commit e03fd4a into docker-archive:18.01 Jan 4, 2018
@andrewhsu andrewhsu deleted the tt branch January 4, 2018 00:01
docker-jenkins pushed a commit that referenced this pull request Sep 23, 2019
@docker-unir
Merge pull request #377 from tao12345666333/bump-go-1.12.9
637d2ee 
Merged with https://github.com/seemethere/unir
Upstream-commit: 90265a7
Component: packaging
docker-jenkins pushed a commit that referenced this pull request Sep 26, 2019
@thaJeztah
Merge pull request #377 from kolyshkin/18.09-backport-log-max-file-1-…
7fbee43 
…follow

[18.09 backport] logger: fix follow logs for max-file=1
Upstream-commit: e34d52d1baa1b68bf248396575c2e62a61e6d88b
Component: engine
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
@docker-unir
Merge pull request docker-archive#377 from tao12345666333/bump-go-1.12.9
90265a7 
Merged with https://github.com/seemethere/unir
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@seemethere seemethere seemethere approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

18.01.0

Development

Successfully merging this pull request may close these issues.

3 participants

@andrewhsu @seemethere @riyazdf