From 14177ebc2424a0f7d734d9974c557fb75cb6185c Mon Sep 17 00:00:00 2001 From: Osier Yang Date: Thu, 30 Jan 2014 19:48:23 +0800 Subject: [PATCH] tests: Modify the scsi util tests Add tests/virscsidata/sg0 and tests/virscsidata/sg8 as the test input for constructing scsi->sg_path. And change the scsi generic number of "1:0:0:0", because it's easy to hide the problem (assuming most machines have a CDROM drive). Signed-off-by: Osier Yang --- tests/virscsidata/1:0:0:0/block/{sr0 => sdh}/dev | 0 tests/virscsidata/1:0:0:0/scsi_generic/{sg1 => sg8}/dev | 0 tests/virscsidata/sg0 | 0 tests/virscsidata/sg8 | 0 tests/virscsitest.c | 4 ++-- 5 files changed, 2 insertions(+), 2 deletions(-) rename tests/virscsidata/1:0:0:0/block/{sr0 => sdh}/dev (100%) rename tests/virscsidata/1:0:0:0/scsi_generic/{sg1 => sg8}/dev (100%) create mode 100644 tests/virscsidata/sg0 create mode 100644 tests/virscsidata/sg8 diff --git a/tests/virscsidata/1:0:0:0/block/sr0/dev b/tests/virscsidata/1:0:0:0/block/sdh/dev similarity index 100% rename from tests/virscsidata/1:0:0:0/block/sr0/dev rename to tests/virscsidata/1:0:0:0/block/sdh/dev diff --git a/tests/virscsidata/1:0:0:0/scsi_generic/sg1/dev b/tests/virscsidata/1:0:0:0/scsi_generic/sg8/dev similarity index 100% rename from tests/virscsidata/1:0:0:0/scsi_generic/sg1/dev rename to tests/virscsidata/1:0:0:0/scsi_generic/sg8/dev diff --git a/tests/virscsidata/sg0 b/tests/virscsidata/sg0 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/virscsidata/sg8 b/tests/virscsidata/sg8 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/virscsitest.c b/tests/virscsitest.c index d256a0e1c1..d4b3e4a159 100644 --- a/tests/virscsitest.c +++ b/tests/virscsitest.c @@ -43,7 +43,7 @@ test1(const void *data ATTRIBUTE_UNUSED) "scsi_host1", 0, 0, 0))) return -1; - if (STRNEQ(name, "sr0")) + if (STRNEQ(name, "sdh")) goto cleanup; ret = 0; @@ -72,7 +72,7 @@ test2(const void *data ATTRIBUTE_UNUSED) sgname = virSCSIDeviceGetSgName(virscsi_prefix, "scsi_host1", 0, 0, 0); - if (!sgname || STRNEQ(sgname, "sg1")) + if (!sgname || STRNEQ(sgname, "sg8")) goto cleanup; if (!(dev = virSCSIDeviceNew(virscsi_prefix, "scsi_host1", -- 2.39.5