Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions cmd/filesystem_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (

"github.com/NETWAYS/check_system_basics/internal/common/thresholds"
"github.com/NETWAYS/check_system_basics/internal/filesystem"

"github.com/NETWAYS/go-check"
"github.com/shirou/gopsutil/v3/disk"
"github.com/stretchr/testify/assert"
)

var (
Expand Down Expand Up @@ -39,8 +39,13 @@ func TestFsCheckResult0(t *testing.T) {

result := computeFsCheckResult(&testFsHalfFull, &config)

assert.Equal(t, check.OK, result.GetStatus())
assert.Equal(t, "/testMountpoint", result.Output)
if check.OK != result.GetStatus() {
t.Fatalf("expected %v, got %v", check.OK, result.GetStatus())
}

if "/testMountpoint" != result.Output {
t.Fatalf("expected %v, got %v", "/testMountpoint", result.Output)
}
}

func TestFsCheckResult1(t *testing.T) {
Expand All @@ -63,5 +68,7 @@ func TestFsCheckResult1(t *testing.T) {

result := computeFsCheckResult(&testFsHalfFull, &config)

assert.Equal(t, check.Warning, result.GetStatus())
if check.Warning != result.GetStatus() {
t.Fatalf("expected %v, got %v", check.Warning, result.GetStatus())
}
}
18 changes: 13 additions & 5 deletions cmd/memory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (

"github.com/NETWAYS/check_system_basics/internal/common/thresholds"
"github.com/NETWAYS/check_system_basics/internal/memory"

"github.com/NETWAYS/go-check"
"github.com/shirou/gopsutil/v3/mem"
"github.com/stretchr/testify/assert"
)

var (
Expand All @@ -34,9 +34,13 @@ func TestComputeMemResultsWithoutThresholds(t *testing.T) {

memPartial := computeMemResults(&config, &testMemStats)

assert.Equal(t, check.OK, memPartial.GetStatus())
if check.OK != memPartial.GetStatus() {
t.Fatalf("expected %v, got %v", check.OK, memPartial.GetStatus())
}

assert.Equal(t, 3, len(memPartial.PartialResults))
if 3 != len(memPartial.PartialResults) {
t.Fatalf("expected %v, got %v", 3, len(memPartial.PartialResults))
}
}

func TestComputeMemResultsWithThresholds(t *testing.T) {
Expand All @@ -56,7 +60,11 @@ func TestComputeMemResultsWithThresholds(t *testing.T) {

memPartial := computeMemResults(&testConfig, &testMemStats)

assert.Equal(t, check.Warning, memPartial.GetStatus())
if check.Warning != memPartial.GetStatus() {
t.Fatalf("expected %v, got %v", check.Warning, memPartial.GetStatus())
}

assert.Equal(t, 3, len(memPartial.PartialResults))
if 3 != len(memPartial.PartialResults) {
t.Fatalf("expected %v, got %v", 3, len(memPartial.PartialResults))
}
}
5 changes: 1 addition & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,17 @@ require (
github.com/shirou/gopsutil/v3 v3.24.5
github.com/spf13/cobra v1.9.1
github.com/spf13/pflag v1.0.7
github.com/stretchr/testify v1.11.0
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/stretchr/testify v1.11.0 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
golang.org/x/sys v0.20.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
1 change: 0 additions & 1 deletion go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
Expand Down
27 changes: 19 additions & 8 deletions internal/common/filter/filter_test.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package filter

import (
"reflect"
"testing"

"github.com/stretchr/testify/assert"
)

type TestObject struct {
Expand Down Expand Up @@ -59,9 +58,13 @@ func TestEmptyFilter(t *testing.T) {

testResult1, err := Filter(objList, &filterList, Name, filterOpts)

assert.NoError(t, err)
if err != nil {
t.Fatalf("expected no error, got %v", err)
}

assert.Equal(t, []TestObject{}, testResult1)
if !reflect.DeepEqual([]TestObject{}, testResult1) {
t.Fatalf("expected %v, got %v", []TestObject{}, testResult1)
}
}

func TestSimpleIncludeFilter(t *testing.T) {
Expand All @@ -83,9 +86,13 @@ func TestSimpleIncludeFilter(t *testing.T) {
},
}

assert.NoError(t, err)
if err != nil {
t.Fatalf("expected no error, got %v", err)
}

assert.Equal(t, testResult1Expected, testResult1)
if !reflect.DeepEqual(testResult1Expected, testResult1) {
t.Fatalf("expected %v, got %v", testResult1Expected, testResult1)
}
}

func TestSimpleExcludeFilter(t *testing.T) {
Expand Down Expand Up @@ -122,7 +129,11 @@ func TestSimpleExcludeFilter(t *testing.T) {
},
}

assert.NoError(t, err)
if err != nil {
t.Fatalf("expected no error, got %v", err)
}

assert.Equal(t, testResult1Expected, testResult1)
if !reflect.DeepEqual(testResult1Expected, testResult1) {
t.Fatalf("expected %v, got %v", testResult1Expected, testResult1)
}
}
6 changes: 4 additions & 2 deletions internal/common/thresholds/thresholds_test.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package thresholds

import (
"reflect"
"testing"

"github.com/NETWAYS/go-check"
"github.com/stretchr/testify/assert"
)

func TestThresholdSet(t *testing.T) {
Expand All @@ -21,5 +21,7 @@ func TestThresholdSet(t *testing.T) {

tw2.Set(tw.String())

assert.Equal(t, tw, tw2)
if !reflect.DeepEqual(tw, tw2) {
t.Fatalf("expected %v, got %v", tw, tw2)
}
}
65 changes: 43 additions & 22 deletions internal/filesystem/filesystem_test.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package filesystem

import (
"reflect"
"testing"

"github.com/shirou/gopsutil/v3/disk"
"github.com/stretchr/testify/assert"
)

var (
Expand Down Expand Up @@ -62,10 +62,13 @@ func TestFilterSDA(t *testing.T) {

result, err := FilterFileSystem(fileSystemSet, &filters)

assert.Nil(t, err)

assert.Equal(t, result, []FilesystemType{testSda})
if err != nil {
t.Fatalf("expected no error, got %v", err)
}

if !reflect.DeepEqual(result, []FilesystemType{testSda}) {
t.Fatalf("expected %v, got %v", result, []FilesystemType{testSda})
}
}

func TestFilterHalfFull(t *testing.T) {
Expand All @@ -75,21 +78,27 @@ func TestFilterHalfFull(t *testing.T) {

result, err := FilterFileSystem(fileSystemSet, &filters)

assert.Nil(t, err)

assert.Equal(t, result, []FilesystemType{testFsHalfFull})
if err != nil {
t.Fatalf("expected no error, got %v", err)
}

if !reflect.DeepEqual(result, []FilesystemType{testFsHalfFull}) {
t.Fatalf("expected %v, got %v", result, []FilesystemType{testFsHalfFull})
}
}

func TestFilterNoFilter(t *testing.T) {
filters := Filters{}

result, err := FilterFileSystem(fileSystemSet, &filters)

assert.Nil(t, err)

assert.Equal(t, result, []FilesystemType{testSda, testFsHalfFull})
if err != nil {
t.Fatalf("expected no error, got %v", err)
}

if !reflect.DeepEqual(result, []FilesystemType{testSda, testFsHalfFull}) {
t.Fatalf("expected %v, got %v", result, []FilesystemType{testSda, testFsHalfFull})
}
}

func TestFilterIncludeDevicePaths(t *testing.T) {
Expand All @@ -99,10 +108,13 @@ func TestFilterIncludeDevicePaths(t *testing.T) {

result, err := FilterFileSystem(fileSystemSet, &filters)

assert.Nil(t, err)

assert.Equal(t, result, []FilesystemType{testSda, testFsHalfFull})
if err != nil {
t.Fatalf("expected no error, got %v", err)
}

if !reflect.DeepEqual(result, []FilesystemType{testSda, testFsHalfFull}) {
t.Fatalf("expected %v, got %v", result, []FilesystemType{testSda, testFsHalfFull})
}
}

func TestFilterExcludeDevicePaths(t *testing.T) {
Expand All @@ -112,10 +124,13 @@ func TestFilterExcludeDevicePaths(t *testing.T) {

result, err := FilterFileSystem(fileSystemSet, &filters)

assert.Nil(t, err)

assert.Equal(t, result, []FilesystemType{testFsHalfFull})
if err != nil {
t.Fatalf("expected no error, got %v", err)
}

if !reflect.DeepEqual(result, []FilesystemType{testFsHalfFull}) {
t.Fatalf("expected %v, got %v", result, []FilesystemType{testFsHalfFull})
}
}

func TestFilterRegexFilter(t *testing.T) {
Expand All @@ -125,10 +140,13 @@ func TestFilterRegexFilter(t *testing.T) {

result, err := FilterFileSystem(fileSystemSet, &filters)

assert.Nil(t, err)

assert.Equal(t, result, []FilesystemType{testSda})
if err != nil {
t.Fatalf("expected no error, got %v", err)
}

if !reflect.DeepEqual(result, []FilesystemType{testSda}) {
t.Fatalf("expected %v, got %v", result, []FilesystemType{testSda})
}
}

func TestFilterRegexFilterAll(t *testing.T) {
Expand All @@ -138,8 +156,11 @@ func TestFilterRegexFilterAll(t *testing.T) {

result, err := FilterFileSystem(fileSystemSet, &filters)

assert.Nil(t, err)

assert.Equal(t, result, []FilesystemType{})
if err != nil {
t.Fatalf("expected no error, got %v", err)
}

if !reflect.DeepEqual(result, []FilesystemType{}) {
t.Fatalf("expected %v, got %v", result, []FilesystemType{})
}
}
23 changes: 16 additions & 7 deletions internal/psi/psi_test.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package psi

import (
"reflect"
"testing"

"github.com/NETWAYS/go-check/perfdata"
"github.com/stretchr/testify/assert"
)

func TestPressureValueString(t *testing.T) {
Expand All @@ -21,7 +21,9 @@ func TestPressureValueString(t *testing.T) {
expected.Add(&perfdata.Perfdata{Label: "preavg300", Value: 3.5, Min: 0, Max: 100, Uom: "%"})
expected.Add(&perfdata.Perfdata{Label: "pretotal", Value: uint64(0), Min: 0, Uom: "c"})

assert.Equal(t, &expected, pv.Perfdata("pre"))
if !reflect.DeepEqual(&expected, pv.Perfdata("pre")) {
t.Fatalf("expected %v, got %v", &expected, pv.Perfdata("pre"))
}
}

func TestPressureElementString(t *testing.T) {
Expand All @@ -43,7 +45,9 @@ func TestPressureElementString(t *testing.T) {
pecpuexpected.Add(&perfdata.Perfdata{Label: "cpu-full-avg300", Value: float64(0.3), Min: 0, Max: 100, Uom: "%"})
pecpuexpected.Add(&perfdata.Perfdata{Label: "cpu-full-total", Value: uint64(0), Min: 0, Uom: "c"})

assert.Equal(t, &pecpuexpected, pecpu.Perfdata())
if !reflect.DeepEqual(&pecpuexpected, pecpu.Perfdata()) {
t.Fatalf("expected %v, got %v", &pecpuexpected, pecpu.Perfdata())
}

peio := PressureElement{
Some: PressureValue{Avg10: 0.1, Avg60: 0.6, Avg300: 0.3, Total: 0},
Expand All @@ -59,20 +63,25 @@ func TestPressureElementString(t *testing.T) {
peioexpected.Add(&perfdata.Perfdata{Label: "io-some-avg300", Value: float64(0.3), Min: 0, Max: 100, Uom: "%"})
peioexpected.Add(&perfdata.Perfdata{Label: "io-some-total", Value: uint64(0), Min: 0, Uom: "c"})

assert.Equal(t, &peioexpected, peio.Perfdata())

if !reflect.DeepEqual(&peioexpected, peio.Perfdata()) {
t.Fatalf("expected %v, got %v", &peioexpected, peio.Perfdata())
}
}

func TestReadPressureFile(t *testing.T) {
cpuPressure, err := readPressureFile("testdata/cpu")

assert.Equal(t, nil, err)
if err != nil {
t.Fatalf("expected no error, got %v", err)
}

expectedResult := PressureElement{
Some: PressureValue{Avg10: 0.0, Avg60: 0.08, Avg300: 0.05, Total: 3391622},
Full: PressureValue{Avg10: 0.0, Avg60: 0.00, Avg300: 0.00, Total: 0},
FullPresent: true,
}

assert.Equal(t, &expectedResult, cpuPressure)
if !reflect.DeepEqual(&expectedResult, cpuPressure) {
t.Fatalf("expected %v, got %v", &expectedResult, cpuPressure)
}
}
Loading
Loading