From 123a856c3ed230085823075f5d84cc80d3cfa98c Mon Sep 17 00:00:00 2001 From: Blake Rouse Date: Mon, 9 Oct 2023 15:20:24 -0400 Subject: [PATCH] Fix tests. --- pkg/testing/define/batch_test.go | 12 +++++++----- pkg/testing/define/testdata/sample_test.go | 22 +++++++++++----------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/pkg/testing/define/batch_test.go b/pkg/testing/define/batch_test.go index f0f997d41f8..a7e265b5f0e 100644 --- a/pkg/testing/define/batch_test.go +++ b/pkg/testing/define/batch_test.go @@ -93,7 +93,7 @@ func TestBatch(t *testing.T) { } expected := []Batch{ { - Group: "default", + Group: Default, OS: OS{ Type: Darwin, Arch: AMD64, @@ -102,7 +102,7 @@ func TestBatch(t *testing.T) { SudoTests: darwinSudoTests, }, { - Group: "default", + Group: Default, OS: OS{ Type: Darwin, Arch: ARM64, @@ -111,7 +111,7 @@ func TestBatch(t *testing.T) { SudoTests: darwinSudoTests, }, { - Group: "default", + Group: Default, OS: OS{ Type: Linux, Arch: AMD64, @@ -120,7 +120,7 @@ func TestBatch(t *testing.T) { SudoTests: linuxSudoTests, }, { - Group: "default", + Group: Default, OS: OS{ Type: Linux, Arch: ARM64, @@ -156,7 +156,7 @@ func TestBatch(t *testing.T) { SudoTests: linuxSudoTests, }, { - Group: "default", + Group: Default, OS: OS{ Type: Windows, Arch: AMD64, @@ -226,6 +226,7 @@ var testLinuxLocalTests = []BatchPackageTest{ var testLinuxLocalBatch = []Batch{ { + Group: Default, OS: OS{ Type: "linux", Arch: "amd64", @@ -238,6 +239,7 @@ var testLinuxLocalBatch = []Batch{ }, }, { + Group: Default, OS: OS{ Type: "linux", Arch: "arm64", diff --git a/pkg/testing/define/testdata/sample_test.go b/pkg/testing/define/testdata/sample_test.go index caecad36bc2..01095aceaac 100644 --- a/pkg/testing/define/testdata/sample_test.go +++ b/pkg/testing/define/testdata/sample_test.go @@ -14,21 +14,21 @@ import ( func TestAnyLocal(t *testing.T) { define.Require(t, define.Requirements{ - Group: "default", + Group: define.Default, Local: true, }) } func TestAnySudo(t *testing.T) { define.Require(t, define.Requirements{ - Group: "default", + Group: define.Default, Sudo: true, }) } func TestDarwinLocal(t *testing.T) { define.Require(t, define.Requirements{ - Group: "default", + Group: define.Default, OS: []define.OS{ { Type: define.Darwin, @@ -40,7 +40,7 @@ func TestDarwinLocal(t *testing.T) { func TestDarwinSudo(t *testing.T) { define.Require(t, define.Requirements{ - Group: "default", + Group: define.Default, OS: []define.OS{ { Type: define.Darwin, @@ -52,7 +52,7 @@ func TestDarwinSudo(t *testing.T) { func TestLinuxLocal(t *testing.T) { define.Require(t, define.Requirements{ - Group: "default", + Group: define.Default, OS: []define.OS{ { Type: define.Linux, @@ -64,7 +64,7 @@ func TestLinuxLocal(t *testing.T) { func TestLinuxSudo(t *testing.T) { define.Require(t, define.Requirements{ - Group: "default", + Group: define.Default, OS: []define.OS{ { Type: define.Linux, @@ -76,7 +76,7 @@ func TestLinuxSudo(t *testing.T) { func TestWindowsLocal(t *testing.T) { define.Require(t, define.Requirements{ - Group: "default", + Group: define.Default, OS: []define.OS{ { Type: define.Windows, @@ -88,7 +88,7 @@ func TestWindowsLocal(t *testing.T) { func TestWindowsSudo(t *testing.T) { define.Require(t, define.Requirements{ - Group: "default", + Group: define.Default, OS: []define.OS{ { Type: define.Windows, @@ -100,7 +100,7 @@ func TestWindowsSudo(t *testing.T) { func TestSpecificCombinationOne(t *testing.T) { define.Require(t, define.Requirements{ - Group: "default", + Group: define.Default, OS: []define.OS{ { Type: define.Linux, @@ -114,7 +114,7 @@ func TestSpecificCombinationOne(t *testing.T) { func TestSpecificCombinationTwo(t *testing.T) { define.Require(t, define.Requirements{ - Group: "default", + Group: define.Default, OS: []define.OS{ { Type: define.Linux, @@ -128,7 +128,7 @@ func TestSpecificCombinationTwo(t *testing.T) { func TestSpecificCombinationWithCloud(t *testing.T) { define.Require(t, define.Requirements{ - Group: "default", + Group: define.Default, OS: []define.OS{ { Type: define.Linux,