1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228
|
Description: Make path to testdata fixtures relative again
'go test' changes the working directory to that of the Go package being
tested, and thus if we are using a shared testdata directory outside of
that package, we need to adjust the paths.
Author: Daniel Swarbrick <dswarbrick@debian.org>
Forwarded: not-needed
--- a/bcache/get_test.go
+++ b/bcache/get_test.go
@@ -19,7 +19,7 @@ import (
)
func TestFSBcacheStats(t *testing.T) {
- bcache, err := NewFS("testdata/fixtures/sys")
+ bcache, err := NewFS("../testdata/fixtures/sys")
if err != nil {
t.Fatalf("failed to access bcache fs: %v", err)
}
--- a/blockdevice/stats_test.go
+++ b/blockdevice/stats_test.go
@@ -21,8 +21,8 @@ import (
const (
failMsgFormat = "%v, expected %v, actual %v"
- procfsFixtures = "testdata/fixtures/proc"
- sysfsFixtures = "testdata/fixtures/sys"
+ procfsFixtures = "../testdata/fixtures/proc"
+ sysfsFixtures = "../testdata/fixtures/sys"
)
func TestDiskstats(t *testing.T) {
@@ -65,7 +65,7 @@ func TestDiskstats(t *testing.T) {
}
func TestBlockDevice(t *testing.T) {
- blockdevice, err := NewFS("testdata/fixtures/proc", "testdata/fixtures/sys")
+ blockdevice, err := NewFS("../testdata/fixtures/proc", "../testdata/fixtures/sys")
if err != nil {
t.Fatalf("failed to access blockdevice fs: %v", err)
}
@@ -155,7 +155,7 @@ func TestBlockDevice(t *testing.T) {
}
func TestBlockDmInfo(t *testing.T) {
- blockdevice, err := NewFS("testdata/fixtures/proc", "testdata/fixtures/sys")
+ blockdevice, err := NewFS("../testdata/fixtures/proc", "../testdata/fixtures/sys")
if err != nil {
t.Fatalf("failed to access blockdevice fs: %v", err)
}
@@ -199,7 +199,7 @@ func TestBlockDmInfo(t *testing.T) {
}
func TestSysBlockDeviceUnderlyingDevices(t *testing.T) {
- blockdevice, err := NewFS("testdata/fixtures/proc", "testdata/fixtures/sys")
+ blockdevice, err := NewFS("../testdata/fixtures/proc", "../testdata/fixtures/sys")
if err != nil {
t.Fatalf("failed to access blockdevice fs: %v", err)
}
--- a/btrfs/get_test.go
+++ b/btrfs/get_test.go
@@ -28,7 +28,7 @@ type alloc struct {
}
func TestFSBtrfsStats(t *testing.T) {
- btrfs, err := NewFS("testdata/fixtures/sys")
+ btrfs, err := NewFS("../testdata/fixtures/sys")
if err != nil {
t.Fatalf("failed to access Btrfs filesystem: %v", err)
}
--- a/iscsi/get_test.go
+++ b/iscsi/get_test.go
@@ -30,12 +30,12 @@ func TestGetStats(t *testing.T) {
Tpgt: []iscsi.TPGT{
{
Name: "tpgt_1",
- TpgtPath: "testdata/fixtures/sys/kernel/config/target/iscsi/iqn.2003-01.org.linux-iscsi.osd1.x8664:sn.8888bbbbddd0/tpgt_1",
+ TpgtPath: "../testdata/fixtures/sys/kernel/config/target/iscsi/iqn.2003-01.org.linux-iscsi.osd1.x8664:sn.8888bbbbddd0/tpgt_1",
IsEnable: true,
Luns: []iscsi.LUN{
{
Name: "lun_0",
- LunPath: "testdata/fixtures/sys/kernel/config/target/iscsi/iqn.2003-01.org.linux-iscsi.osd1.x8664:sn.8888bbbbddd0/tpgt_1/lun/lun_0",
+ LunPath: "../testdata/fixtures/sys/kernel/config/target/iscsi/iqn.2003-01.org.linux-iscsi.osd1.x8664:sn.8888bbbbddd0/tpgt_1/lun/lun_0",
Backstore: "rd_mcp",
ObjectName: "ramdisk_lio_1G",
TypeNumber: "119",
@@ -43,7 +43,7 @@ func TestGetStats(t *testing.T) {
},
},
},
- RootPath: "testdata/fixtures/sys/kernel/config/target/iscsi",
+ RootPath: "../testdata/fixtures/sys/kernel/config/target/iscsi",
},
},
{
@@ -52,12 +52,12 @@ func TestGetStats(t *testing.T) {
Tpgt: []iscsi.TPGT{
{
Name: "tpgt_1",
- TpgtPath: "testdata/fixtures/sys/kernel/config/target/iscsi/iqn.2003-01.org.linux-iscsi.osd1.x8664:sn.abcd1abcd2ab/tpgt_1",
+ TpgtPath: "../testdata/fixtures/sys/kernel/config/target/iscsi/iqn.2003-01.org.linux-iscsi.osd1.x8664:sn.abcd1abcd2ab/tpgt_1",
IsEnable: true,
Luns: []iscsi.LUN{
{
Name: "lun_0",
- LunPath: "testdata/fixtures/sys/kernel/config/target/iscsi/iqn.2003-01.org.linux-iscsi.osd1.x8664:sn.abcd1abcd2ab/tpgt_1/lun/lun_0",
+ LunPath: "../testdata/fixtures/sys/kernel/config/target/iscsi/iqn.2003-01.org.linux-iscsi.osd1.x8664:sn.abcd1abcd2ab/tpgt_1/lun/lun_0",
Backstore: "iblock",
ObjectName: "block_lio_rbd1",
TypeNumber: "0",
@@ -65,7 +65,7 @@ func TestGetStats(t *testing.T) {
},
},
},
- RootPath: "testdata/fixtures/sys/kernel/config/target/iscsi",
+ RootPath: "../testdata/fixtures/sys/kernel/config/target/iscsi",
},
},
{
@@ -74,12 +74,12 @@ func TestGetStats(t *testing.T) {
Tpgt: []iscsi.TPGT{
{
Name: "tpgt_1",
- TpgtPath: "testdata/fixtures/sys/kernel/config/target/iscsi/iqn.2016-11.org.linux-iscsi.igw.x86:dev.rbd0/tpgt_1",
+ TpgtPath: "../testdata/fixtures/sys/kernel/config/target/iscsi/iqn.2016-11.org.linux-iscsi.igw.x86:dev.rbd0/tpgt_1",
IsEnable: true,
Luns: []iscsi.LUN{
{
Name: "lun_0",
- LunPath: "testdata/fixtures/sys/kernel/config/target/iscsi/iqn.2016-11.org.linux-iscsi.igw.x86:dev.rbd0/tpgt_1/lun/lun_0",
+ LunPath: "../testdata/fixtures/sys/kernel/config/target/iscsi/iqn.2016-11.org.linux-iscsi.igw.x86:dev.rbd0/tpgt_1/lun/lun_0",
Backstore: "fileio",
ObjectName: "file_lio_1G",
TypeNumber: "1",
@@ -87,7 +87,7 @@ func TestGetStats(t *testing.T) {
},
},
},
- RootPath: "testdata/fixtures/sys/kernel/config/target/iscsi",
+ RootPath: "../testdata/fixtures/sys/kernel/config/target/iscsi",
},
},
{
@@ -96,12 +96,12 @@ func TestGetStats(t *testing.T) {
Tpgt: []iscsi.TPGT{
{
Name: "tpgt_1",
- TpgtPath: "testdata/fixtures/sys/kernel/config/target/iscsi/iqn.2016-11.org.linux-iscsi.igw.x86:sn.ramdemo/tpgt_1",
+ TpgtPath: "../testdata/fixtures/sys/kernel/config/target/iscsi/iqn.2016-11.org.linux-iscsi.igw.x86:sn.ramdemo/tpgt_1",
IsEnable: true,
Luns: []iscsi.LUN{
{
Name: "lun_0",
- LunPath: "testdata/fixtures/sys/kernel/config/target/iscsi/iqn.2016-11.org.linux-iscsi.igw.x86:sn.ramdemo/tpgt_1/lun/lun_0",
+ LunPath: "../testdata/fixtures/sys/kernel/config/target/iscsi/iqn.2016-11.org.linux-iscsi.igw.x86:sn.ramdemo/tpgt_1/lun/lun_0",
Backstore: "rbd",
ObjectName: "iscsi-images-demo",
TypeNumber: "0",
@@ -109,7 +109,7 @@ func TestGetStats(t *testing.T) {
},
},
},
- RootPath: "testdata/fixtures/sys/kernel/config/target/iscsi",
+ RootPath: "../testdata/fixtures/sys/kernel/config/target/iscsi",
},
},
}
@@ -125,7 +125,7 @@ func TestGetStats(t *testing.T) {
{1504, 4733, 1234},
}
- sysconfigfs, err := iscsi.NewFS("testdata/fixtures/sys", "testdata/fixtures/sys/kernel/config")
+ sysconfigfs, err := iscsi.NewFS("../testdata/fixtures/sys", "../testdata/fixtures/sys/kernel/config")
if err != nil {
t.Fatalf("failed to access xfs fs: %v", err)
}
--- a/sysfs/fs_test.go
+++ b/sysfs/fs_test.go
@@ -19,7 +19,7 @@ package sysfs
import "testing"
const (
- sysTestFixtures = "testdata/fixtures/sys"
+ sysTestFixtures = "../testdata/fixtures/sys"
)
func TestNewFS(t *testing.T) {
--- a/xfs/parse_test.go
+++ b/xfs/parse_test.go
@@ -731,7 +731,7 @@ func TestParseStats(t *testing.T) {
stats, err = xfs.ParseStats(strings.NewReader(tt.s))
}
if tt.fs {
- xfs, err := xfs.NewFS("testdata/fixtures/proc", "testdata/fixtures/sys")
+ xfs, err := xfs.NewFS("../testdata/fixtures/proc", "../testdata/fixtures/sys")
if err != nil {
t.Fatalf("failed to access xfs fs: %v", err)
}
--- a/xfs/xfs_test.go
+++ b/xfs/xfs_test.go
@@ -21,7 +21,7 @@ import (
)
func TestReadProcStat(t *testing.T) {
- xfs, err := xfs.NewFS("testdata/fixtures/proc", "testdata/fixtures/sys")
+ xfs, err := xfs.NewFS("../testdata/fixtures/proc", "../testdata/fixtures/sys")
if err != nil {
t.Fatalf("failed to access xfs fs: %v", err)
}
@@ -38,7 +38,7 @@ func TestReadProcStat(t *testing.T) {
}
func TestReadSysStats(t *testing.T) {
- xfs, err := xfs.NewFS("testdata/fixtures/proc", "testdata/fixtures/sys")
+ xfs, err := xfs.NewFS("../testdata/fixtures/proc", "../testdata/fixtures/sys")
if err != nil {
t.Fatalf("failed to access xfs fs: %v", err)
}
--- a/internal/fs/fs_test.go
+++ b/internal/fs/fs_test.go
@@ -16,7 +16,7 @@ package fs
import "testing"
const (
- sysTestFixtures = "testdata/fixtures/sys"
+ sysTestFixtures = "../../testdata/fixtures/sys"
)
func TestNewFS(t *testing.T) {
|