refactor(integration_tests): Re-enable compression and resolve lint w…

…arnings
ProtonMail · Nov 22, 2023 · 3d55a7e · 3d55a7e
1 parent 49087ba
commit 3d55a7e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/openpgp/integration_tests/end_to_end_test.go b/openpgp/integration_tests/end_to_end_test.go
@@ -209,7 +209,7 @@ func encDecTest(t *testing.T, from testVector, testVectors []testVector) {
 					"Message signed by wrong key id, got: %v, want: %v",
 					*md.SignedBy, expectedKeyID)
 			}
-			if signKey.PublicKey.Version == 6 && bytes.Compare(md.SignedByFingerprint, expectedFingerprint) != 0 {
+			if signKey.PublicKey.Version == 6 && !bytes.Equal(md.SignedByFingerprint, expectedFingerprint) {
 				t.Fatalf(
 					"Message signed by wrong key id, got: %x, want: %x",
 					md.SignedByFingerprint, expectedFingerprint)

diff --git a/openpgp/integration_tests/utils_test.go b/openpgp/integration_tests/utils_test.go
@@ -228,8 +228,8 @@ func randConfig() *packet.Config {
 
 	compAlgos := []packet.CompressionAlgo{
 		packet.CompressionNone,
-		//packet.CompressionZIP,
-		//packet.CompressionZLIB,
+		packet.CompressionZIP,
+		packet.CompressionZLIB,
 	}
 	compAlgo := compAlgos[mathrand.Intn(len(compAlgos))]
 
@@ -265,7 +265,7 @@ func randConfig() *packet.Config {
 	}
 
 	level := mathrand.Intn(11) - 1
-	compConf := &packet.CompressionConfig{level}
+	compConf := &packet.CompressionConfig{Level: level}
 
 	var v6 bool
 	if mathrand.Int()%2 == 0 {

diff --git a/openpgp/integration_tests/v2/utils_test.go b/openpgp/integration_tests/v2/utils_test.go
@@ -228,8 +228,8 @@ func randConfig() *packet.Config {
 
 	compAlgos := []packet.CompressionAlgo{
 		packet.CompressionNone,
-		//packet.CompressionZIP,
-		//packet.CompressionZLIB,
+		packet.CompressionZIP,
+		packet.CompressionZLIB,
 	}
 	compAlgo := compAlgos[mathrand.Intn(len(compAlgos))]