From 91ea8398ebc0febce20b9a460f9372998cd0b80f Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 2 Oct 2021 21:25:34 +0300 Subject: add dgrep test --- integrationtests/dgrep_test.go | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 integrationtests/dgrep_test.go (limited to 'integrationtests/dgrep_test.go') diff --git a/integrationtests/dgrep_test.go b/integrationtests/dgrep_test.go new file mode 100644 index 0000000..691e2a1 --- /dev/null +++ b/integrationtests/dgrep_test.go @@ -0,0 +1,40 @@ +package integrationtests + +import ( + "os" + "testing" +) + +func TestDGrep(t *testing.T) { + testdataFile := "mapr_testdata.log" + stdoutFile := "dgrep.out" + expectedResultFile := "dgrep_expected.txt" + + if err := runCommand(t, "../dgrep", []string{"-spartan", "--grep", "20211002-071947", testdataFile}, stdoutFile); err != nil { + t.Error(err) + return + } + + if err := compareFiles(t, stdoutFile, expectedResultFile); err != nil { + t.Error(err) + return + } + os.Remove(stdoutFile) +} + +func TestDGrep2(t *testing.T) { + testdataFile := "mapr_testdata.log" + stdoutFile := "dgrep.out" + expectedResultFile := "dgrep_expected2.txt" + + if err := runCommand(t, "../dgrep", []string{"-spartan", "--grep", "20211002-071947", "--invert", testdataFile}, stdoutFile); err != nil { + t.Error(err) + return + } + + if err := compareFiles(t, stdoutFile, expectedResultFile); err != nil { + t.Error(err) + return + } + os.Remove(stdoutFile) +} -- cgit v1.2.3 From 07e1470892beacf0722276f94bacbd822b002540 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sun, 3 Oct 2021 13:09:32 +0300 Subject: add dmap tests --- integrationtests/dgrep_test.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'integrationtests/dgrep_test.go') diff --git a/integrationtests/dgrep_test.go b/integrationtests/dgrep_test.go index 691e2a1..32c0ace 100644 --- a/integrationtests/dgrep_test.go +++ b/integrationtests/dgrep_test.go @@ -6,16 +6,16 @@ import ( ) func TestDGrep(t *testing.T) { - testdataFile := "mapr_testdata.log" - stdoutFile := "dgrep.out" - expectedResultFile := "dgrep_expected.txt" + inFile := "mapr_testdata.log" + stdoutFile := "dgrep.stdout.tmp" + expectedStdoutFile := "dgrep.txt.expected" - if err := runCommand(t, "../dgrep", []string{"-spartan", "--grep", "20211002-071947", testdataFile}, stdoutFile); err != nil { + if err := runCommand(t, "../dgrep", []string{"-spartan", "--grep", "20211002-071947", inFile}, stdoutFile); err != nil { t.Error(err) return } - if err := compareFiles(t, stdoutFile, expectedResultFile); err != nil { + if err := compareFiles(t, stdoutFile, expectedStdoutFile); err != nil { t.Error(err) return } @@ -23,16 +23,16 @@ func TestDGrep(t *testing.T) { } func TestDGrep2(t *testing.T) { - testdataFile := "mapr_testdata.log" - stdoutFile := "dgrep.out" - expectedResultFile := "dgrep_expected2.txt" + inFile := "mapr_testdata.log" + stdoutFile := "dgrep2.stdout.tmp" + expectedStdoutFile := "dgrep2.txt.expected" - if err := runCommand(t, "../dgrep", []string{"-spartan", "--grep", "20211002-071947", "--invert", testdataFile}, stdoutFile); err != nil { + if err := runCommand(t, "../dgrep", []string{"-spartan", "--grep", "20211002-071947", "--invert", inFile}, stdoutFile); err != nil { t.Error(err) return } - if err := compareFiles(t, stdoutFile, expectedResultFile); err != nil { + if err := compareFiles(t, stdoutFile, expectedStdoutFile); err != nil { t.Error(err) return } -- cgit v1.2.3 From 7a7169791a64190e1002e38bc9c04ad0d5c1ce1f Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 9 Oct 2021 16:44:28 +0300 Subject: add dtail health check unit test. --- integrationtests/dgrep_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'integrationtests/dgrep_test.go') diff --git a/integrationtests/dgrep_test.go b/integrationtests/dgrep_test.go index 32c0ace..6a15ebd 100644 --- a/integrationtests/dgrep_test.go +++ b/integrationtests/dgrep_test.go @@ -10,7 +10,7 @@ func TestDGrep(t *testing.T) { stdoutFile := "dgrep.stdout.tmp" expectedStdoutFile := "dgrep.txt.expected" - if err := runCommand(t, "../dgrep", []string{"-spartan", "--grep", "20211002-071947", inFile}, stdoutFile); err != nil { + if _, err := runCommand(t, "../dgrep", []string{"-spartan", "--grep", "20211002-071947", inFile}, stdoutFile); err != nil { t.Error(err) return } @@ -27,7 +27,7 @@ func TestDGrep2(t *testing.T) { stdoutFile := "dgrep2.stdout.tmp" expectedStdoutFile := "dgrep2.txt.expected" - if err := runCommand(t, "../dgrep", []string{"-spartan", "--grep", "20211002-071947", "--invert", inFile}, stdoutFile); err != nil { + if _, err := runCommand(t, "../dgrep", []string{"-spartan", "--grep", "20211002-071947", "--invert", inFile}, stdoutFile); err != nil { t.Error(err) return } -- cgit v1.2.3 From 97747ea0f3178f7f5890512d483fdccaa82846b0 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 9 Oct 2021 21:10:29 +0300 Subject: vetting and linting and some code restyling --- integrationtests/dgrep_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'integrationtests/dgrep_test.go') diff --git a/integrationtests/dgrep_test.go b/integrationtests/dgrep_test.go index 6a15ebd..4d54a2d 100644 --- a/integrationtests/dgrep_test.go +++ b/integrationtests/dgrep_test.go @@ -9,12 +9,12 @@ func TestDGrep(t *testing.T) { inFile := "mapr_testdata.log" stdoutFile := "dgrep.stdout.tmp" expectedStdoutFile := "dgrep.txt.expected" + args := []string{"-spartan", "--grep", "20211002-071947", inFile} - if _, err := runCommand(t, "../dgrep", []string{"-spartan", "--grep", "20211002-071947", inFile}, stdoutFile); err != nil { + if _, err := runCommand(t, "../dgrep", args, stdoutFile); err != nil { t.Error(err) return } - if err := compareFiles(t, stdoutFile, expectedStdoutFile); err != nil { t.Error(err) return @@ -26,12 +26,12 @@ func TestDGrep2(t *testing.T) { inFile := "mapr_testdata.log" stdoutFile := "dgrep2.stdout.tmp" expectedStdoutFile := "dgrep2.txt.expected" + args := []string{"-spartan", "--grep", "20211002-071947", "--invert", inFile} - if _, err := runCommand(t, "../dgrep", []string{"-spartan", "--grep", "20211002-071947", "--invert", inFile}, stdoutFile); err != nil { + if _, err := runCommand(t, "../dgrep", args, stdoutFile); err != nil { t.Error(err) return } - if err := compareFiles(t, stdoutFile, expectedStdoutFile); err != nil { t.Error(err) return -- cgit v1.2.3 From 71f89dc7ec7cf993d1eca98771212afe6310e9c8 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sun, 10 Oct 2021 19:42:48 +0300 Subject: refactor --- integrationtests/dgrep_test.go | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'integrationtests/dgrep_test.go') diff --git a/integrationtests/dgrep_test.go b/integrationtests/dgrep_test.go index 4d54a2d..15519b3 100644 --- a/integrationtests/dgrep_test.go +++ b/integrationtests/dgrep_test.go @@ -1,6 +1,7 @@ package integrationtests import ( + "context" "os" "testing" ) @@ -9,16 +10,20 @@ func TestDGrep(t *testing.T) { inFile := "mapr_testdata.log" stdoutFile := "dgrep.stdout.tmp" expectedStdoutFile := "dgrep.txt.expected" - args := []string{"-spartan", "--grep", "20211002-071947", inFile} - if _, err := runCommand(t, "../dgrep", args, stdoutFile); err != nil { + _, err := runCommand(context.TODO(), stdoutFile, + "../dgrep", "--spartan", "--grep", "20211002-071947", inFile) + + if err != nil { t.Error(err) return } + if err := compareFiles(t, stdoutFile, expectedStdoutFile); err != nil { t.Error(err) return } + os.Remove(stdoutFile) } @@ -26,15 +31,19 @@ func TestDGrep2(t *testing.T) { inFile := "mapr_testdata.log" stdoutFile := "dgrep2.stdout.tmp" expectedStdoutFile := "dgrep2.txt.expected" - args := []string{"-spartan", "--grep", "20211002-071947", "--invert", inFile} - if _, err := runCommand(t, "../dgrep", args, stdoutFile); err != nil { + _, err := runCommand(context.TODO(), stdoutFile, + "../dgrep", "-spartan", "--grep", "20211002-071947", "--invert", inFile) + + if err != nil { t.Error(err) return } + if err := compareFiles(t, stdoutFile, expectedStdoutFile); err != nil { t.Error(err) return } + os.Remove(stdoutFile) } -- cgit v1.2.3 From 7b873100d94ddc3c698a620cb83b61dcb2074303 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Wed, 13 Oct 2021 09:00:03 +0300 Subject: add another dcat integration test - catting 100 files at once --- integrationtests/dgrep_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'integrationtests/dgrep_test.go') diff --git a/integrationtests/dgrep_test.go b/integrationtests/dgrep_test.go index 15519b3..57b5d86 100644 --- a/integrationtests/dgrep_test.go +++ b/integrationtests/dgrep_test.go @@ -11,7 +11,7 @@ func TestDGrep(t *testing.T) { stdoutFile := "dgrep.stdout.tmp" expectedStdoutFile := "dgrep.txt.expected" - _, err := runCommand(context.TODO(), stdoutFile, + _, err := runCommand(context.TODO(), t, stdoutFile, "../dgrep", "--spartan", "--grep", "20211002-071947", inFile) if err != nil { @@ -32,7 +32,7 @@ func TestDGrep2(t *testing.T) { stdoutFile := "dgrep2.stdout.tmp" expectedStdoutFile := "dgrep2.txt.expected" - _, err := runCommand(context.TODO(), stdoutFile, + _, err := runCommand(context.TODO(), t, stdoutFile, "../dgrep", "-spartan", "--grep", "20211002-071947", "--invert", inFile) if err != nil { -- cgit v1.2.3 From 06ece112c0dd20c0c211c538216fe64ebe4045c9 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Thu, 14 Oct 2021 20:10:55 +0300 Subject: add dgrep context integration tests --- integrationtests/dgrep_test.go | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'integrationtests/dgrep_test.go') diff --git a/integrationtests/dgrep_test.go b/integrationtests/dgrep_test.go index 57b5d86..b63ac45 100644 --- a/integrationtests/dgrep_test.go +++ b/integrationtests/dgrep_test.go @@ -47,3 +47,46 @@ func TestDGrep2(t *testing.T) { os.Remove(stdoutFile) } + +func TestDGrepContext(t *testing.T) { + inFile := "mapr_testdata.log" + stdoutFile := "dgrepcontext.stdout.tmp" + expectedStdoutFile := "dgrepcontext.txt.expected" + + _, err := runCommand(context.TODO(), t, stdoutFile, + "../dgrep", "--spartan", "--grep", "20211002-071947", + "-after", "3", "-before", "3", inFile) + + if err != nil { + t.Error(err) + return + } + + if err := compareFiles(t, stdoutFile, expectedStdoutFile); err != nil { + t.Error(err) + return + } + + os.Remove(stdoutFile) +} + +func TestDGrepContext2(t *testing.T) { + inFile := "mapr_testdata.log" + stdoutFile := "dgrepcontext2.stdout.tmp" + expectedStdoutFile := "dgrepcontext2.txt.expected" + + _, err := runCommand(context.TODO(), t, stdoutFile, + "../dgrep", "--spartan", "--grep", "20211002", "-max", "3", inFile) + + if err != nil { + t.Error(err) + return + } + + if err := compareFiles(t, stdoutFile, expectedStdoutFile); err != nil { + t.Error(err) + return + } + + os.Remove(stdoutFile) +} -- cgit v1.2.3 From 860c41441b3bcf542b5701ae2257812879ce47b4 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Tue, 19 Oct 2021 19:01:12 +0300 Subject: Set DTAIL_RUN_INTEGRATIONT_TEST to yes for integration tests --- integrationtests/dgrep_test.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'integrationtests/dgrep_test.go') diff --git a/integrationtests/dgrep_test.go b/integrationtests/dgrep_test.go index b63ac45..8fe0a49 100644 --- a/integrationtests/dgrep_test.go +++ b/integrationtests/dgrep_test.go @@ -4,9 +4,15 @@ import ( "context" "os" "testing" + + "github.com/mimecast/dtail/internal/config" ) func TestDGrep(t *testing.T) { + if !config.Env("DTAIL_RUN_INTEGRATION_TESTS") { + t.Log("Skipping") + return + } inFile := "mapr_testdata.log" stdoutFile := "dgrep.stdout.tmp" expectedStdoutFile := "dgrep.txt.expected" @@ -28,6 +34,10 @@ func TestDGrep(t *testing.T) { } func TestDGrep2(t *testing.T) { + if !config.Env("DTAIL_RUN_INTEGRATION_TESTS") { + t.Log("Skipping") + return + } inFile := "mapr_testdata.log" stdoutFile := "dgrep2.stdout.tmp" expectedStdoutFile := "dgrep2.txt.expected" @@ -49,6 +59,10 @@ func TestDGrep2(t *testing.T) { } func TestDGrepContext(t *testing.T) { + if !config.Env("DTAIL_RUN_INTEGRATION_TESTS") { + t.Log("Skipping") + return + } inFile := "mapr_testdata.log" stdoutFile := "dgrepcontext.stdout.tmp" expectedStdoutFile := "dgrepcontext.txt.expected" @@ -71,6 +85,10 @@ func TestDGrepContext(t *testing.T) { } func TestDGrepContext2(t *testing.T) { + if !config.Env("DTAIL_RUN_INTEGRATION_TESTS") { + t.Log("Skipping") + return + } inFile := "mapr_testdata.log" stdoutFile := "dgrepcontext2.stdout.tmp" expectedStdoutFile := "dgrepcontext2.txt.expected" -- cgit v1.2.3