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

[17.12] skip DockerTrustSuite tests for 17.12#344

Merged
andrewhsu merged 2 commits intodocker-archive:17.12from
andrewhsu:tt
Dec 9, 2017
Merged

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

Conversation

@andrewhsu
Copy link
Copy Markdown
Contributor

@andrewhsu andrewhsu commented Dec 9, 2017 •
edited
Loading

Seeing failures in DockerTrustSuite:

FAIL: docker_cli_build_test.go:4213: DockerTrustSuite.TestTrustedBuildTagFromReleasesRole
FAIL: docker_cli_build_test.go:4244: DockerTrustSuite.TestTrustedBuildTagIgnoresOtherDelegationRoles
FAIL: docker_cli_create_test.go:293: DockerTrustSuite.TestTrustedCreate
FAIL: docker_cli_create_test.go:329: DockerTrustSuite.TestTrustedCreateFromBadTrustServer
FAIL: docker_cli_create_test.go:319: 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:3184: DockerTrustSuite.TestTrustedRun
FAIL: docker_cli_run_test.go:3213: 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 and 17.11 caused by updated stderr output from docker/cli#636 Fix stdout and errors in image/trust

This pr is duplicate of #278 [17.11] update trust tests for 17.11

With cherry-pick ec6b0a1 and 250b84e:

$ git cherry-pick -s -x ec6b0a1 250b84e

No conflicts.

seemethere and others added 2 commits December 8, 2017 16:49
@seemethere @andrewhsu
Blacklist tests, will be rewritten later on
fbfeceb 
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>
@riyazdf @andrewhsu
update integration-cli tests for stderr output
d256539 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
(cherry picked from commit 250b84e)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@andrewhsu andrewhsu added this to the 17.12.0 milestone Dec 9, 2017
@andrewhsu
Copy link
Copy Markdown
Contributor Author

andrewhsu commented Dec 9, 2017

The DockerTrustSuite is green now (because stuff is skipped):

PASS: docker_cli_build_test.go:4178: DockerTrustSuite.TestBuildContextDirIsSymlink 0.962s
PASS: docker_cli_build_test.go:6113: DockerTrustSuite.TestCopyFromTrustedBuild 3.186s
PASS: docker_cli_plugins_test.go:357: DockerTrustSuite.TestPluginTrustedInstall  11.812s
PASS: docker_cli_plugins_test.go:386: DockerTrustSuite.TestPluginUntrustedInstall  4.628s
PASS: docker_cli_build_test.go:4143: DockerTrustSuite.TestTrustedBuild 1.324s
SKIP: docker_cli_build_test.go:4213: DockerTrustSuite.TestTrustedBuildTagFromReleasesRole (Blacklisting for Docker CE)
SKIP: docker_cli_build_test.go:4245: DockerTrustSuite.TestTrustedBuildTagIgnoresOtherDelegationRoles (Blacklisting for Docker CE)
PASS: docker_cli_build_test.go:4163: DockerTrustSuite.TestTrustedBuildUntrustedTag 0.032s
PASS: docker_cli_create_test.go:293: DockerTrustSuite.TestTrustedCreate  0.472s
PASS: docker_cli_create_test.go:329: DockerTrustSuite.TestTrustedCreateFromBadTrustServer  0.643s
PASS: docker_cli_create_test.go:319: DockerTrustSuite.TestTrustedIsolatedCreate  0.408s
PASS: docker_cli_pull_trusted_test.go:25: DockerTrustSuite.TestTrustedIsolatedPull 0.379s
PASS: docker_cli_pull_trusted_test.go:85: DockerTrustSuite.TestTrustedOfflinePull  0.506s
PASS: docker_cli_pull_trusted_test.go:14: DockerTrustSuite.TestTrustedPull 0.393s
PASS: docker_cli_pull_trusted_test.go:100: DockerTrustSuite.TestTrustedPullDelete  0.789s
PASS: docker_cli_pull_trusted_test.go:48: DockerTrustSuite.TestTrustedPullFromBadTrustServer 0.620s
SKIP: docker_cli_pull_trusted_test.go:191: DockerTrustSuite.TestTrustedPullIgnoresOtherDelegationRoles (Blacklisting for Docker CE)
SKIP: docker_cli_pull_trusted_test.go:135: DockerTrustSuite.TestTrustedPullReadsFromReleasesRole (Blacklisting for Docker CE)
SKIP: docker_cli_push_test.go:284: DockerTrustSuite.TestTrustedPush (Blacklisting for Docker CE)
PASS: docker_cli_push_test.go:485: DockerTrustSuite.TestTrustedPushDoesntSignTargetsIfDelegationsExist 0.393s
PASS: docker_cli_push_test.go:411: DockerTrustSuite.TestTrustedPushSignsAllFirstLevelRolesWeHaveKeysFor  0.662s
PASS: docker_cli_push_test.go:449: DockerTrustSuite.TestTrustedPushSignsForRolesWithKeysAndValidPaths  0.646s
PASS: docker_cli_push_test.go:304: DockerTrustSuite.TestTrustedPushWithEnvPasswords  0.340s
PASS: docker_cli_push_test.go:353: DockerTrustSuite.TestTrustedPushWithExistingSignedTag 0.458s
PASS: docker_cli_push_test.go:339: DockerTrustSuite.TestTrustedPushWithExistingTag 0.358s
PASS: docker_cli_push_test.go:317: DockerTrustSuite.TestTrustedPushWithFailingServer 0.211s
SKIP: docker_cli_push_test.go:369: DockerTrustSuite.TestTrustedPushWithIncorrectPassphraseForNonRoot (Blacklisting for Docker CE)
PASS: docker_cli_push_test.go:385: DockerTrustSuite.TestTrustedPushWithReleasesDelegationOnly  0.567s
PASS: docker_cli_push_test.go:329: DockerTrustSuite.TestTrustedPushWithoutServerAndUntrusted 0.199s
PASS: docker_cli_run_test.go:3184: DockerTrustSuite.TestTrustedRun 1.230s
PASS: docker_cli_run_test.go:3213: DockerTrustSuite.TestTrustedRunFromBadTrustServer 1.057s
PASS: docker_cli_create_test.go:304: DockerTrustSuite.TestUntrustedCreate  0.213s
PASS: docker_cli_pull_trusted_test.go:34: DockerTrustSuite.TestUntrustedPull 0.208s
PASS: docker_cli_run_test.go:3197: DockerTrustSuite.TestUntrustedRun 0.221s
OK: 28 passed, 6 skipped
PASS

@andrewhsu andrewhsu requested a review from thaJeztah December 9, 2017 01:39
seemethere
seemethere approved these changes Dec 9, 2017
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 merged commit d2b3575 into docker-archive:17.12 Dec 9, 2017
@andrewhsu andrewhsu deleted the tt branch December 9, 2017 02:00
@andrewhsu andrewhsu mentioned this pull request Jan 3, 2018
Merged
@andrewhsu andrewhsu mentioned this pull request Jan 24, 2018
Merged
docker-jenkins pushed a commit that referenced this pull request Jun 25, 2019
@seemethere
Merge pull request #344 from zelahi/add-fedora-31
39821f4 
[TAR-849] ADDED Dockerfile for fedora-31
Upstream-commit: 1583b53
Component: packaging
docker-jenkins pushed a commit that referenced this pull request Sep 10, 2019
@thaJeztah
Merge pull request #344 from thaJeztah/19.03_backport_DESKTOP_1286_wi…
54f4ad7 
…n_admin_error_readability

[19.03 backport] Improve readability of Windows connect error
Upstream-commit: 9cc467c3b328770baf4f8de95ce5b7497871dcd7
Component: engine
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
@seemethere
Merge pull request docker-archive#344 from zelahi/add-fedora-31
1583b53 
[TAR-849] ADDED Dockerfile for fedora-31
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@thaJeztah thaJeztah Awaiting requested review from thaJeztah

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

17.12.0

Development

Successfully merging this pull request may close these issues.

3 participants

@andrewhsu @seemethere @riyazdf