fix(tests): Remove unnecessary duration conversion

pdf · Nov 16, 2021 · b6a29ab · b6a29ab
1 parent bbd3d91
commit b6a29ab
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
 			}