Browse code

Merge pull request #15133 from dmcgowan/notary-fix-test-date

Skip notary tests which update system clock

Alexander Morozov authored on 2015/07/30 04:51:05
Showing 4 changed files
... ...
@@ -345,6 +345,7 @@ func (s *DockerTrustSuite) TestTrustedIsolatedCreate(c *check.C) {
345 345
 }
346 346
 
347 347
 func (s *DockerTrustSuite) TestCreateWhenCertExpired(c *check.C) {
348
+	c.Skip("Currently changes system time, causing instability")
348 349
 	repoName := s.setupTrustedImage(c, "trusted-create-expired")
349 350
 
350 351
 	// Certificates have 10 years of expiration
... ...
@@ -225,6 +225,7 @@ func (s *DockerTrustSuite) TestUntrustedPull(c *check.C) {
225 225
 }
226 226
 
227 227
 func (s *DockerTrustSuite) TestPullWhenCertExpired(c *check.C) {
228
+	c.Skip("Currently changes system time, causing instability")
228 229
 	repoName := s.setupTrustedImage(c, "trusted-cert-expired")
229 230
 
230 231
 	// Certificates have 10 years of expiration
... ...
@@ -331,6 +332,7 @@ func (s *DockerTrustSuite) TestTrustedPullFromBadTrustServer(c *check.C) {
331 331
 }
332 332
 
333 333
 func (s *DockerTrustSuite) TestTrustedPullWithExpiredSnapshot(c *check.C) {
334
+	c.Skip("Currently changes system time, causing instability")
334 335
 	repoName := fmt.Sprintf("%v/dockercliexpiredtimestamppull/trusted:latest", privateRegistryURL)
335 336
 	// tag the image and upload it to the private registry
336 337
 	dockerCmd(c, "tag", "busybox", repoName)
... ...
@@ -287,6 +287,7 @@ func (s *DockerTrustSuite) TestTrustedPushWithIncorrectPassphraseForNonRoot(c *c
287 287
 }
288 288
 
289 289
 func (s *DockerTrustSuite) TestTrustedPushWithExpiredSnapshot(c *check.C) {
290
+	c.Skip("Currently changes system time, causing instability")
290 291
 	repoName := fmt.Sprintf("%v/dockercliexpiredsnapshot/trusted:latest", privateRegistryURL)
291 292
 	// tag the image and upload it to the private registry
292 293
 	dockerCmd(c, "tag", "busybox", repoName)
... ...
@@ -322,6 +323,7 @@ func (s *DockerTrustSuite) TestTrustedPushWithExpiredSnapshot(c *check.C) {
322 322
 }
323 323
 
324 324
 func (s *DockerTrustSuite) TestTrustedPushWithExpiredTimestamp(c *check.C) {
325
+	c.Skip("Currently changes system time, causing instability")
325 326
 	repoName := fmt.Sprintf("%v/dockercliexpiredtimestamppush/trusted:latest", privateRegistryURL)
326 327
 	// tag the image and upload it to the private registry
327 328
 	dockerCmd(c, "tag", "busybox", repoName)
... ...
@@ -2625,6 +2625,7 @@ func (s *DockerTrustSuite) TestUntrustedRun(c *check.C) {
2625 2625
 }
2626 2626
 
2627 2627
 func (s *DockerTrustSuite) TestRunWhenCertExpired(c *check.C) {
2628
+	c.Skip("Currently changes system time, causing instability")
2628 2629
 	repoName := s.setupTrustedImage(c, "trusted-run-expired")
2629 2630
 
2630 2631
 	// Certificates have 10 years of expiration