diff --git a/collector/collector_test.go b/collector/collector_test.go index 4d20318..2752861 100644 --- a/collector/collector_test.go +++ b/collector/collector_test.go @@ -30,17 +30,13 @@ func callCollector(ctx context.Context, collector prometheus.Collector, metricRe } } -func defaultConfig(z zfs.Client) (ZFSConfig, error) { - duration, err := time.ParseDuration(`5m`) - if err != nil { - return ZFSConfig{}, err - } +func defaultConfig(z zfs.Client) ZFSConfig { return ZFSConfig{ DisableMetrics: true, - Deadline: duration, + Deadline: 5 * time.Minute, Logger: logger, ZFSClient: z, - }, nil + } } func stringPointer(s string) *string { diff --git a/collector/dataset_test.go b/collector/dataset_test.go index 2011681..864a326 100644 --- a/collector/dataset_test.go +++ b/collector/dataset_test.go @@ -215,10 +215,7 @@ zfs_dataset_unsupported{name="testpool/test",pool="testpool",type="filesystem"} t.Parallel() ctrl, ctx := gomock.WithContext(context.Background(), t) zfsClient := mock_zfs.NewMockClient(ctrl) - config, err := defaultConfig(zfsClient) - if err != nil { - t.Fatal(err) - } + config := defaultConfig(zfsClient) if tc.explicitPools != nil { config.Pools = tc.explicitPools } diff --git a/collector/pool_test.go b/collector/pool_test.go index b8dc9ef..a77e924 100644 --- a/collector/pool_test.go +++ b/collector/pool_test.go @@ -174,10 +174,7 @@ zfs_pool_unsupported{pool="testpool"} 1024 t.Parallel() ctrl, ctx := gomock.WithContext(context.Background(), t) zfsClient := mock_zfs.NewMockClient(ctrl) - config, err := defaultConfig(zfsClient) - if err != nil { - t.Fatal(err) - } + config := defaultConfig(zfsClient) if tc.explicitPools != nil { config.Pools = tc.explicitPools }