@@ -19,7 +19,6 @@ package capabilities
19
19
20
20
import (
21
21
"encoding/xml"
22
- "os"
23
22
"testing"
24
23
25
24
"k8s.io/apimachinery/pkg/api/resource"
@@ -40,18 +39,9 @@ func TestNewClient(t *testing.T) {
40
39
}
41
40
42
41
func TestNewClientWithCustomSocket (t * testing.T ) {
43
- // Set custom socket path
44
- originalSocket := os .Getenv ("LIBVIRT_SOCKET" )
45
- defer func () {
46
- if originalSocket != "" {
47
- os .Setenv ("LIBVIRT_SOCKET" , originalSocket )
48
- } else {
49
- os .Unsetenv ("LIBVIRT_SOCKET" )
50
- }
51
- }()
52
-
42
+ // Set custom socket path using t.Setenv for automatic cleanup
53
43
customSocket := "/custom/libvirt-sock"
54
- os .Setenv ("LIBVIRT_SOCKET" , customSocket )
44
+ t .Setenv ("LIBVIRT_SOCKET" , customSocket )
55
45
56
46
client := NewClient ()
57
47
if client == nil {
@@ -386,10 +376,9 @@ func TestConvertWithRealExampleData(t *testing.T) {
386
376
387
377
// Test helper function to create a mock capabilities structure
388
378
func createMockCapabilities (arch string , cells []mockCell ) Capabilities {
389
- var capabilitiesCells []CapabilitiesHostTopologyCell
390
-
391
- for _ , cell := range cells {
392
- capabilitiesCells = append (capabilitiesCells , CapabilitiesHostTopologyCell {
379
+ capabilitiesCells := make ([]CapabilitiesHostTopologyCell , 0 , len (cells ))
380
+ for i , cell := range cells {
381
+ capabilitiesCells [i ] = CapabilitiesHostTopologyCell {
393
382
ID : cell .ID ,
394
383
Memory : CapabilitiesHostTopologyCellMemory {
395
384
Unit : cell .MemoryUnit ,
@@ -398,7 +387,7 @@ func createMockCapabilities(arch string, cells []mockCell) Capabilities {
398
387
CPUs : CapabilitiesHostTopologyCellCPUs {
399
388
Num : cell .CPUCount ,
400
389
},
401
- })
390
+ }
402
391
}
403
392
404
393
return Capabilities {
0 commit comments