mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #15133 from dmcgowan/notary-fix-test-date
Skip notary tests which update system clock
This commit is contained in:
commit
0f85fadb4e
4 changed files with 6 additions and 0 deletions
|
@ -345,6 +345,7 @@ func (s *DockerTrustSuite) TestTrustedIsolatedCreate(c *check.C) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *DockerTrustSuite) TestCreateWhenCertExpired(c *check.C) {
|
func (s *DockerTrustSuite) TestCreateWhenCertExpired(c *check.C) {
|
||||||
|
c.Skip("Currently changes system time, causing instability")
|
||||||
repoName := s.setupTrustedImage(c, "trusted-create-expired")
|
repoName := s.setupTrustedImage(c, "trusted-create-expired")
|
||||||
|
|
||||||
// Certificates have 10 years of expiration
|
// Certificates have 10 years of expiration
|
||||||
|
|
|
@ -225,6 +225,7 @@ func (s *DockerTrustSuite) TestUntrustedPull(c *check.C) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *DockerTrustSuite) TestPullWhenCertExpired(c *check.C) {
|
func (s *DockerTrustSuite) TestPullWhenCertExpired(c *check.C) {
|
||||||
|
c.Skip("Currently changes system time, causing instability")
|
||||||
repoName := s.setupTrustedImage(c, "trusted-cert-expired")
|
repoName := s.setupTrustedImage(c, "trusted-cert-expired")
|
||||||
|
|
||||||
// Certificates have 10 years of expiration
|
// Certificates have 10 years of expiration
|
||||||
|
@ -331,6 +332,7 @@ func (s *DockerTrustSuite) TestTrustedPullFromBadTrustServer(c *check.C) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *DockerTrustSuite) TestTrustedPullWithExpiredSnapshot(c *check.C) {
|
func (s *DockerTrustSuite) TestTrustedPullWithExpiredSnapshot(c *check.C) {
|
||||||
|
c.Skip("Currently changes system time, causing instability")
|
||||||
repoName := fmt.Sprintf("%v/dockercliexpiredtimestamppull/trusted:latest", privateRegistryURL)
|
repoName := fmt.Sprintf("%v/dockercliexpiredtimestamppull/trusted:latest", privateRegistryURL)
|
||||||
// tag the image and upload it to the private registry
|
// tag the image and upload it to the private registry
|
||||||
dockerCmd(c, "tag", "busybox", repoName)
|
dockerCmd(c, "tag", "busybox", repoName)
|
||||||
|
|
|
@ -287,6 +287,7 @@ func (s *DockerTrustSuite) TestTrustedPushWithIncorrectPassphraseForNonRoot(c *c
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *DockerTrustSuite) TestTrustedPushWithExpiredSnapshot(c *check.C) {
|
func (s *DockerTrustSuite) TestTrustedPushWithExpiredSnapshot(c *check.C) {
|
||||||
|
c.Skip("Currently changes system time, causing instability")
|
||||||
repoName := fmt.Sprintf("%v/dockercliexpiredsnapshot/trusted:latest", privateRegistryURL)
|
repoName := fmt.Sprintf("%v/dockercliexpiredsnapshot/trusted:latest", privateRegistryURL)
|
||||||
// tag the image and upload it to the private registry
|
// tag the image and upload it to the private registry
|
||||||
dockerCmd(c, "tag", "busybox", repoName)
|
dockerCmd(c, "tag", "busybox", repoName)
|
||||||
|
@ -322,6 +323,7 @@ func (s *DockerTrustSuite) TestTrustedPushWithExpiredSnapshot(c *check.C) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *DockerTrustSuite) TestTrustedPushWithExpiredTimestamp(c *check.C) {
|
func (s *DockerTrustSuite) TestTrustedPushWithExpiredTimestamp(c *check.C) {
|
||||||
|
c.Skip("Currently changes system time, causing instability")
|
||||||
repoName := fmt.Sprintf("%v/dockercliexpiredtimestamppush/trusted:latest", privateRegistryURL)
|
repoName := fmt.Sprintf("%v/dockercliexpiredtimestamppush/trusted:latest", privateRegistryURL)
|
||||||
// tag the image and upload it to the private registry
|
// tag the image and upload it to the private registry
|
||||||
dockerCmd(c, "tag", "busybox", repoName)
|
dockerCmd(c, "tag", "busybox", repoName)
|
||||||
|
|
|
@ -2625,6 +2625,7 @@ func (s *DockerTrustSuite) TestUntrustedRun(c *check.C) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *DockerTrustSuite) TestRunWhenCertExpired(c *check.C) {
|
func (s *DockerTrustSuite) TestRunWhenCertExpired(c *check.C) {
|
||||||
|
c.Skip("Currently changes system time, causing instability")
|
||||||
repoName := s.setupTrustedImage(c, "trusted-run-expired")
|
repoName := s.setupTrustedImage(c, "trusted-run-expired")
|
||||||
|
|
||||||
// Certificates have 10 years of expiration
|
// Certificates have 10 years of expiration
|
||||||
|
|
Loading…
Add table
Reference in a new issue