From 9646f5c2a1fec98be9dc6a344fcc2f10e2809c91 Mon Sep 17 00:00:00 2001 From: mattdurham Date: Wed, 3 Apr 2024 10:55:10 -0400 Subject: [PATCH] Seperate windows and non windows tests. (#6816) --- .../promtailconvert/promtailconvert_test.go | 2 ++ .../promtailconvert_windows_test.go | 15 +++++++++++++++ .../windowsevents.river | 0 .../windowsevents.yaml | 0 .../windowsevents_relabel.river | 0 .../windowsevents_relabel.yaml | 0 6 files changed, 17 insertions(+) create mode 100644 internal/converter/internal/promtailconvert/promtailconvert_windows_test.go rename internal/converter/internal/promtailconvert/{testdata => testdatawindows}/windowsevents.river (100%) rename internal/converter/internal/promtailconvert/{testdata => testdatawindows}/windowsevents.yaml (100%) rename internal/converter/internal/promtailconvert/{testdata => testdatawindows}/windowsevents_relabel.river (100%) rename internal/converter/internal/promtailconvert/{testdata => testdatawindows}/windowsevents_relabel.yaml (100%) diff --git a/internal/converter/internal/promtailconvert/promtailconvert_test.go b/internal/converter/internal/promtailconvert/promtailconvert_test.go index 63ea75afbe1c..0932e62eaeea 100644 --- a/internal/converter/internal/promtailconvert/promtailconvert_test.go +++ b/internal/converter/internal/promtailconvert/promtailconvert_test.go @@ -1,3 +1,5 @@ +//go:build linux + package promtailconvert_test import ( diff --git a/internal/converter/internal/promtailconvert/promtailconvert_windows_test.go b/internal/converter/internal/promtailconvert/promtailconvert_windows_test.go new file mode 100644 index 000000000000..82d85b7e13aa --- /dev/null +++ b/internal/converter/internal/promtailconvert/promtailconvert_windows_test.go @@ -0,0 +1,15 @@ +//go:build windows + +package promtailconvert_test + +import ( + "testing" + + "github.com/grafana/agent/internal/converter/internal/promtailconvert" + "github.com/grafana/agent/internal/converter/internal/test_common" + _ "github.com/grafana/agent/internal/static/metrics/instance" // Imported to override default values via the init function. +) + +func TestConvert(t *testing.T) { + test_common.TestDirectory(t, "testdatawindows", ".yaml", true, []string{}, promtailconvert.Convert) +} diff --git a/internal/converter/internal/promtailconvert/testdata/windowsevents.river b/internal/converter/internal/promtailconvert/testdatawindows/windowsevents.river similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/windowsevents.river rename to internal/converter/internal/promtailconvert/testdatawindows/windowsevents.river diff --git a/internal/converter/internal/promtailconvert/testdata/windowsevents.yaml b/internal/converter/internal/promtailconvert/testdatawindows/windowsevents.yaml similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/windowsevents.yaml rename to internal/converter/internal/promtailconvert/testdatawindows/windowsevents.yaml diff --git a/internal/converter/internal/promtailconvert/testdata/windowsevents_relabel.river b/internal/converter/internal/promtailconvert/testdatawindows/windowsevents_relabel.river similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/windowsevents_relabel.river rename to internal/converter/internal/promtailconvert/testdatawindows/windowsevents_relabel.river diff --git a/internal/converter/internal/promtailconvert/testdata/windowsevents_relabel.yaml b/internal/converter/internal/promtailconvert/testdatawindows/windowsevents_relabel.yaml similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/windowsevents_relabel.yaml rename to internal/converter/internal/promtailconvert/testdatawindows/windowsevents_relabel.yaml