Skip to content

Commit c811df1

Browse files
committed
refactor(systemdCollector): drop utests
1 parent 71a8ff8 commit c811df1

File tree

2 files changed

+6
-68
lines changed

2 files changed

+6
-68
lines changed

collector/systemd_linux.go

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,6 @@ type systemdCollector struct {
8383

8484
var unitStatesName = []string{"active", "activating", "deactivating", "inactive", "failed"}
8585

86-
type Manager interface {
87-
GetManagerProperty(prop string) (string, error)
88-
}
89-
9086
func init() {
9187
registerCollector("systemd", defaultDisabled, NewSystemdCollector)
9288
}
@@ -437,8 +433,8 @@ func (c *systemdCollector) collectSummaryMetrics(ch chan<- prometheus.Metric, su
437433
}
438434
}
439435

440-
func (c *systemdCollector) collectSystemState(m Manager, ch chan<- prometheus.Metric) error {
441-
systemState, err := m.GetManagerProperty("SystemState")
436+
func (c *systemdCollector) collectSystemState(conn *dbus.Conn, ch chan<- prometheus.Metric) error {
437+
systemState, err := conn.GetManagerProperty("SystemState")
442438
if err != nil {
443439
return fmt.Errorf("couldn't get system state: %w", err)
444440
}
@@ -506,8 +502,8 @@ func filterUnits(units []unit, includePattern, excludePattern *regexp.Regexp, lo
506502
return filtered
507503
}
508504

509-
func (c *systemdCollector) getSystemdVersion(m Manager) (float64, string) {
510-
version, err := m.GetManagerProperty("Version")
505+
func (c *systemdCollector) getSystemdVersion(conn *dbus.Conn) (float64, string) {
506+
version, err := conn.GetManagerProperty("Version")
511507
if err != nil {
512508
c.logger.Debug("Unable to get systemd version property, defaulting to 0")
513509
return 0, ""
@@ -523,8 +519,8 @@ func (c *systemdCollector) getSystemdVersion(m Manager) (float64, string) {
523519
return v, version
524520
}
525521

526-
func (c *systemdCollector) getSystemdVirtualization(m Manager) string {
527-
virt, err := m.GetManagerProperty("Virtualization")
522+
func (c *systemdCollector) getSystemdVirtualization(conn *dbus.Conn) string {
523+
virt, err := conn.GetManagerProperty("Virtualization")
528524
if err != nil {
529525
c.logger.Debug("Could not get Virtualization property", "err", err)
530526
return "unknown"

collector/systemd_linux_test.go

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package collector
1818

1919
import (
20-
"errors"
2120
"io"
2221
"log/slog"
2322
"regexp"
@@ -138,60 +137,3 @@ func testSummaryHelper(t *testing.T, state string, actual float64, expected floa
138137
t.Errorf("Summary mode didn't count %s jobs correctly. Actual: %f, expected: %f", state, actual, expected)
139138
}
140139
}
141-
142-
// fakeManager implements the Manager interface for testing.
143-
type fakeManager struct {
144-
result string
145-
err error
146-
}
147-
148-
// GetManagerProperty returns the controlled result for tests.
149-
func (f *fakeManager) GetManagerProperty(prop string) (string, error) {
150-
return f.result, f.err
151-
}
152-
153-
func Test_systemdCollector_getSystemdVirtualization(t *testing.T) {
154-
logger := slog.New(slog.NewTextHandler(io.Discard, nil))
155-
c, err := NewSystemdCollector(logger)
156-
if err != nil {
157-
t.Fatal(err)
158-
}
159-
sysdCollector := c.(*systemdCollector)
160-
161-
tests := []struct {
162-
name string
163-
fake *fakeManager
164-
want string
165-
}{
166-
{
167-
name: "Error",
168-
fake: &fakeManager{
169-
err: errors.New("test error"),
170-
},
171-
want: "unknown",
172-
},
173-
{
174-
name: "Empty",
175-
fake: &fakeManager{
176-
result: `""`,
177-
},
178-
want: "none",
179-
},
180-
{
181-
name: "Valid",
182-
fake: &fakeManager{
183-
result: `"kvm"`,
184-
},
185-
want: "kvm",
186-
},
187-
}
188-
189-
for _, tt := range tests {
190-
t.Run(tt.name, func(t *testing.T) {
191-
got := sysdCollector.getSystemdVirtualization(tt.fake)
192-
if got != tt.want {
193-
t.Errorf("getSystemdVirtualization() = %v, want %v", got, tt.want)
194-
}
195-
})
196-
}
197-
}

0 commit comments

Comments
 (0)