update e2e tests

Signed-off-by: Patrick Zheng <[email protected]>
notaryproject · Jan 10, 2025 · 5cf2aaa · 5cf2aaa
1 parent 767e216
commit 5cf2aaa
Showing 1 changed file with 14 additions and 17 deletions.
diff --git a/test/e2e/suite/command/blob/sign.go b/test/e2e/suite/command/blob/sign.go
@@ -26,27 +26,27 @@ import (
 
 const tsaURL = "http://timestamp.digicert.com"
 
-var _ = Describe("notation blob sign", func() {
+var _ = Describe("notation blob sign", Serial, func() {
 	// Success cases
 	It("with blob sign", func() {
 		HostWithBlob(BaseOptions(), func(notation *utils.ExecOpts, blobPath string, vhost *utils.VirtualHost) {
-			notation.Exec("blob", "sign", "--force", blobPath).
+			notation.WithWorkDir(vhost.AbsolutePath()).Exec("blob", "sign", blobPath).
 				MatchKeyWords(SignSuccessfully).
 				MatchKeyWords("Signature file written to")
 		})
 	})
 
 	It("with COSE format", func() {
 		HostWithBlob(BaseOptions(), func(notation *utils.ExecOpts, blobPath string, vhost *utils.VirtualHost) {
-			notation.Exec("blob", "sign", "--signature-format", "cose", "--force", blobPath).
+			notation.WithWorkDir(vhost.AbsolutePath()).Exec("blob", "sign", "--signature-format", "cose", blobPath).
 				MatchKeyWords(SignSuccessfully).
 				MatchKeyWords("Signature file written to")
 		})
 	})
 
 	It("with specified media-type", func() {
 		HostWithBlob(BaseOptions(), func(notation *utils.ExecOpts, blobPath string, vhost *utils.VirtualHost) {
-			notation.Exec("blob", "sign", "--force", "--media-type", "other-media-type", blobPath).
+			notation.WithWorkDir(vhost.AbsolutePath()).Exec("blob", "sign", "--media-type", "other-media-type", blobPath).
 				MatchKeyWords(SignSuccessfully).
 				MatchKeyWords("Signature file written to")
 		})
@@ -55,43 +55,42 @@ var _ = Describe("notation blob sign", func() {
 	It("with specific key", func() {
 		HostWithBlob(BaseOptions(), func(notation *utils.ExecOpts, blobPath string, vhost *utils.VirtualHost) {
 			const keyName = "sKey"
-			notation.Exec("cert", "generate-test", keyName).
+			notation.WithWorkDir(vhost.AbsolutePath()).Exec("cert", "generate-test", keyName).
 				MatchKeyWords(fmt.Sprintf("notation/localkeys/%s.crt", keyName))
 
-			notation.Exec("blob", "sign", "--force", "--key", keyName, blobPath).
+			notation.WithWorkDir(vhost.AbsolutePath()).Exec("blob", "sign", "--key", keyName, blobPath).
 				MatchKeyWords(SignSuccessfully).
 				MatchKeyWords("Signature file written to")
 		})
 	})
 
 	It("with expiry in 24h", func() {
 		HostWithBlob(BaseOptions(), func(notation *utils.ExecOpts, blobPath string, vhost *utils.VirtualHost) {
-			notation.Exec("blob", "sign", "--expiry", "24h", "--force", blobPath).
+			notation.WithWorkDir(vhost.AbsolutePath()).Exec("blob", "sign", "--expiry", "24h", blobPath).
 				MatchKeyWords(SignSuccessfully).
 				MatchKeyWords("Signature file written to")
 		})
 	})
 
 	It("with signature directory", func() {
 		HostWithBlob(BaseOptions(), func(notation *utils.ExecOpts, blobPath string, vhost *utils.VirtualHost) {
-			blobDir := filepath.Dir(blobPath)
-			notation.Exec("blob", "sign", "--force", "--signature-directory", blobDir, blobPath).
+			notation.Exec("blob", "sign", "--force", "--signature-directory", vhost.AbsolutePath(), blobPath).
 				MatchKeyWords(SignSuccessfully).
-				MatchKeyWords(fmt.Sprintf("Signature file written to %s", filepath.Join(blobDir, "blobFile.jws.sig")))
+				MatchKeyWords(fmt.Sprintf("Signature file written to %s", filepath.Join(vhost.AbsolutePath(), "blobFile.jws.sig")))
 		})
 	})
 
 	It("with user metadata", func() {
 		HostWithBlob(BaseOptions(), func(notation *utils.ExecOpts, blobPath string, vhost *utils.VirtualHost) {
-			notation.Exec("blob", "sign", "--force", "--user-metadata", "k1=v1", "--user-metadata", "k2=v2", blobPath).
+			notation.WithWorkDir(vhost.AbsolutePath()).Exec("blob", "sign", "--user-metadata", "k1=v1", "--user-metadata", "k2=v2", blobPath).
 				MatchKeyWords(SignSuccessfully).
 				MatchKeyWords("Signature file written to")
 		})
 	})
 
 	It("with timestamping", func() {
 		HostWithBlob(BaseOptions(), func(notation *utils.ExecOpts, blobPath string, vhost *utils.VirtualHost) {
-			notation.Exec("blob", "sign", "--force", "--timestamp-url", tsaURL, "--timestamp-root-cert", filepath.Join(NotationE2EConfigPath, "timestamp", "DigiCertTSARootSHA384.cer"), blobPath).
+			notation.WithWorkDir(vhost.AbsolutePath()).Exec("blob", "sign", "--timestamp-url", tsaURL, "--timestamp-root-cert", filepath.Join(NotationE2EConfigPath, "timestamp", "DigiCertTSARootSHA384.cer"), blobPath).
 				MatchKeyWords(SignSuccessfully).
 				MatchKeyWords("Signature file written to")
 		})
@@ -147,14 +146,12 @@ var _ = Describe("notation blob sign", func() {
 
 	It("with no permission to write the signature file", func() {
 		HostWithBlob(BaseOptions(), func(notation *utils.ExecOpts, blobPath string, vhost *utils.VirtualHost) {
-			blobDir := filepath.Dir(blobPath)
-			sigDir := filepath.Join(blobDir, "signature")
-			if err := os.MkdirAll(sigDir, 0000); err != nil {
+			if err := os.MkdirAll(vhost.AbsolutePath(), 0000); err != nil {
 				Fail(err.Error())
 			}
-			defer os.Chmod(sigDir, 0700)
+			defer os.Chmod(vhost.AbsolutePath(), 0700)
 
-			notation.ExpectFailure().Exec("blob", "sign", "--signature-directory", sigDir, blobPath).
+			notation.ExpectFailure().Exec("blob", "sign", "--signature-directory", vhost.AbsolutePath(), blobPath).
 				MatchErrKeyWords("permission denied")
 		})
 	})