From b9f59c6d9a7799eb889d2a9d861925a5d869922b Mon Sep 17 00:00:00 2001 From: Jim Wang Date: Wed, 3 Feb 2021 09:59:44 -0700 Subject: [PATCH] feat(security): Address PR feedback Address Lenny's PR feedback about unit tests Signed-off-by: Jim Wang --- .../bootstrapper/helper/redis_config_test.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/internal/security/bootstrapper/helper/redis_config_test.go b/internal/security/bootstrapper/helper/redis_config_test.go index d99295d710..98e031ef2a 100644 --- a/internal/security/bootstrapper/helper/redis_config_test.go +++ b/internal/security/bootstrapper/helper/redis_config_test.go @@ -28,10 +28,8 @@ func TestGenerateConfig(t *testing.T) { confFile, err := os.OpenFile(testConfFile, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0755) require.NoError(t, err) defer func() { - err = confFile.Close() - require.NoError(t, err) - err = os.RemoveAll(testConfFile) - require.NoError(t, err) + _ = confFile.Close() + _ = os.RemoveAll(testConfFile) }() fw := bufio.NewWriter(confFile) @@ -39,19 +37,22 @@ func TestGenerateConfig(t *testing.T) { err = GenerateConfig(fw, &testFakePwd) require.NoError(t, err) - require.NoError(t, fw.Flush()) + err = fw.Flush() + require.NoError(t, err) inputFile, err := os.Open(testConfFile) require.NoError(t, err) defer inputFile.Close() inputScanner := bufio.NewScanner(inputFile) inputScanner.Split(bufio.ScanLines) - lineCount := 0 + var outputlines []string // Read until a newline for each Scan for inputScanner.Scan() { - lineCount++ line := inputScanner.Text() require.Contains(t, line, testFakePwd) + outputlines = append(outputlines, line) } - require.Equal(t, 2, lineCount) + require.Equal(t, 2, len(outputlines)) + require.Equal(t, outputlines[0], "user default on allkeys +@all -@dangerous >"+testFakePwd) + require.Equal(t, outputlines[1], "requirepass "+testFakePwd) }