test(pgp): temporary fix for random order test

2024-10-05 23:59:13 +00:00 · 2020-12-10 00:29:56 +01:00 · 2020-12-10 00:29:56 +01:00 · 182f4c7f6c
parent c85bbf54da
commit 182f4c7f6c
5 changed files with 14 additions and 9 deletions
--- a/pkg/pgp/.snapshots/TestCheckPgpKeys-Two_dummy_packages_requiring_the_same_key
+++ b/pkg/pgp/.snapshots/TestCheckPgpKeys-Two_dummy_packages_requiring_the_same_key
@ -1,5 +1,5 @@

-[1m[36m:: [0m[0m[1mPGP keys need importing:[0m
+
 [1m[33m -> [0m[0m[36mABAF11C65A2970B130ABE3C479BE3E4300411886[0m, required by: [36mdummy-1 (dummy-1 dummy-2)[0m
 [1m[36m:: [0m[0m[1mImporting keys with gpg...[0m
-
+[1m[36m:: [0m[0m[1mPGP keys need importing:[0m
--- a/pkg/pgp/.snapshots/TestCheckPgpKeys-_one_valid_key_not_yet_in_the_keyring
+++ b/pkg/pgp/.snapshots/TestCheckPgpKeys-_one_valid_key_not_yet_in_the_keyring
@ -1,5 +1,5 @@

-[1m[36m:: [0m[0m[1mPGP keys need importing:[0m
+
 [1m[33m -> [0m[0m[36m487EACC08557AD082088DABA1EB2638FF56C0C53[0m, required by: [36mcower[0m
 [1m[36m:: [0m[0m[1mImporting keys with gpg...[0m
-
+[1m[36m:: [0m[0m[1mPGP keys need importing:[0m
--- a/pkg/pgp/.snapshots/TestCheckPgpKeys-one_already_in_keyring
+++ b/pkg/pgp/.snapshots/TestCheckPgpKeys-one_already_in_keyring
@ -1,5 +1,5 @@

-[1m[36m:: [0m[0m[1mPGP keys need importing:[0m
+
 [1m[33m -> [0m[0m[36mC52048C0C0748FEE227D47A2702353E0F7E48EDB[0m, required by: [36mdummy-3[0m
 [1m[36m:: [0m[0m[1mImporting keys with gpg...[0m
-
+[1m[36m:: [0m[0m[1mPGP keys need importing:[0m
--- a/pkg/pgp/.snapshots/TestCheckPgpKeys-two_valid_keys_not_yet_in_the_keyring
+++ b/pkg/pgp/.snapshots/TestCheckPgpKeys-two_valid_keys_not_yet_in_the_keyring
@ -1,6 +1,6 @@

-[1m[36m:: [0m[0m[1mPGP keys need importing:[0m
+
 [1m[33m -> [0m[0m[36m11E521D646982372EB577A1F8F0871F202119294[0m, required by: [36mlibc++[0m
 [1m[33m -> [0m[0m[36mB6C8F98282B944E3B0D5C2530FC3042E345AD05D[0m, required by: [36mlibc++[0m
 [1m[36m:: [0m[0m[1mImporting keys with gpg...[0m
-
+[1m[36m:: [0m[0m[1mPGP keys need importing:[0m
--- a/pkg/pgp/keys_test.go
+++ b/pkg/pgp/keys_test.go
@ -9,6 +9,8 @@ import (
 	"os"
 	"path"
 	"regexp"
+	"sort"
+	"strings"
 	"testing"

 	gosrc "github.com/Morganamilo/go-srcinfo"
@ -255,7 +257,10 @@ func TestCheckPgpKeys(t *testing.T) {
 				out, _ := ioutil.ReadAll(r)
 				os.Stdout = rescueStdout

-				cupaloy.SnapshotT(t, string(out))
+				splitLines := strings.Split(string(out), "\n")
+				sort.Strings(splitLines)
+
+				cupaloy.SnapshotT(t, strings.Join(splitLines, "\n"))
 				return
 			}
 			// Here, we want to see the error.