From 5a4a6c4a17dd694fc7a52c6ffab4ecf4dc2faff9 Mon Sep 17 00:00:00 2001 From: Tejal Desai Date: Fri, 31 Jan 2020 15:23:38 -0800 Subject: [PATCH 1/2] fix test flake --- pkg/util/fs_util_test.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/util/fs_util_test.go b/pkg/util/fs_util_test.go index 1b714fb59..9b8d9972c 100644 --- a/pkg/util/fs_util_test.go +++ b/pkg/util/fs_util_test.go @@ -1300,6 +1300,12 @@ func TestUpdateWhitelist(t *testing.T) { whitelist = initialWhitelist defer func() { whitelist = initialWhitelist }() UpdateWhitelist(tt.whitelistVarRun) + sort.Slice(tt.expected, func(i, j int) bool { + return tt.expected[i].Path < tt.expected[j].Path + }) + sort.Slice(whitelist, func(i, j int) bool { + return whitelist[i].Path < whitelist[j].Path + }) testutil.CheckDeepEqual(t, tt.expected, whitelist) }) } From 0e833e46437489e15820266a1aaefcbad61884c0 Mon Sep 17 00:00:00 2001 From: Tejal Desai Date: Sat, 1 Feb 2020 09:29:18 -0800 Subject: [PATCH 2/2] fix test --- pkg/util/fs_util_test.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkg/util/fs_util_test.go b/pkg/util/fs_util_test.go index 9b8d9972c..e2529ed97 100644 --- a/pkg/util/fs_util_test.go +++ b/pkg/util/fs_util_test.go @@ -1279,6 +1279,10 @@ func TestUpdateWhitelist(t *testing.T) { Path: "/var/run", PrefixMatchOnly: false, }, + { + Path: "/tmp/apt-key-gpghome", + PrefixMatchOnly: true, + }, }, }, { @@ -1292,6 +1296,10 @@ func TestUpdateWhitelist(t *testing.T) { Path: "/etc/mtab", PrefixMatchOnly: false, }, + { + Path: "/tmp/apt-key-gpghome", + PrefixMatchOnly: true, + }, }, }, }