scsi: Refactor tests to use a tmp image file.

This'll be necessary for tests that involve writing later, but it should
also fix the CI issue, because we're no longer trying to find the test
image file at runtime - instead it's embedded in the test binary then
written to a temp file at runtime.

Signed-off-by: Gaelan Steele <[email protected]>

Author: Gaelan

Cargo.lock

@@ -20,3 +20,6 @@ vmm-sys-util = "0.8.0"
 structopt = "0.3"
 log = "0.4.14"
 
+[dev-dependencies]
+tempfile = "3.2.0"
+

src/scsi/Cargo.toml

@@ -9,6 +9,7 @@ mod virtio;
 
 use std::{
     convert::TryInto,
+    fs::File,
     io::{self, ErrorKind, Read},
     path::PathBuf,
     process::exit,
@@ -343,7 +344,7 @@ fn main() {
     }
 
     for image in opt.images {
-        let mut dev = BlockDevice::new(&image).expect("Opening image");
+        let mut dev = BlockDevice::new(File::open(image).expect("Opening image"));
         dev.set_write_protected(opt.read_only);
         dev.set_solid_state(opt.solid_state);
         target.add_lun(Box::new(dev));

src/scsi/src/main.rs

@@ -3,7 +3,6 @@ use std::{
     fs::File,
     io::{self, Read, Write},
     os::unix::prelude::*,
-    path::Path,
 };
 
 use log::{debug, error, warn};
@@ -29,15 +28,15 @@ pub struct BlockDevice {
 }
 
 impl BlockDevice {
-    pub fn new(path: &Path) -> io::Result<Self> {
+    pub const fn new(file: File) -> Self {
         // TODO: trying 4096 logical/physical for now. May need to fall
         // back to 512 logical/4096 physical for back compat.
-        Ok(Self {
-            file: File::open(path)?,
+        Self {
+            file,
             block_size: 512,
             write_protected: false,
             solid_state: false,
-        })
+        }
     }
 
     fn read_blocks(&self, lba: u64, blocks: u64) -> io::Result<Vec<u8>> {

src/scsi/src/scsi/emulation/block_device.rs

@@ -1,6 +1,4 @@
-use std::path::Path;
-
-use super::{do_command_fail_lun, do_command_in_lun};
+use super::{do_command_fail_lun, do_command_in_lun, null_image};
 use crate::scsi::{
     emulation::{block_device::BlockDevice, EmulatedTarget},
     sense,
@@ -10,7 +8,7 @@ use crate::scsi::{
 fn test_report_luns() {
     let mut target: EmulatedTarget<Vec<u8>, &[u8]> = EmulatedTarget::new();
     for _ in 0..5 {
-        let dev = BlockDevice::new(Path::new("/dev/null")).unwrap();
+        let dev = BlockDevice::new(null_image());
         target.add_lun(Box::new(dev));
     }
 
@@ -45,7 +43,7 @@ fn test_report_luns() {
 fn test_report_luns_empty() {
     let mut target: EmulatedTarget<Vec<u8>, &[u8]> = EmulatedTarget::new();
     for _ in 0..5 {
-        let dev = BlockDevice::new(Path::new("/dev/null")).unwrap();
+        let dev = BlockDevice::new(null_image());
         target.add_lun(Box::new(dev));
     }
 
@@ -76,7 +74,7 @@ fn test_report_luns_empty() {
 #[test]
 fn test_request_sense() {
     let mut target: EmulatedTarget<Vec<u8>, &[u8]> = EmulatedTarget::new();
-    let dev = BlockDevice::new(Path::new("/dev/null")).unwrap();
+    let dev = BlockDevice::new(null_image());
     target.add_lun(Box::new(dev));
 
     do_command_in_lun(
@@ -96,7 +94,7 @@ fn test_request_sense() {
 #[test]
 fn test_request_sense_descriptor_format() {
     let mut target: EmulatedTarget<Vec<u8>, &[u8]> = EmulatedTarget::new();
-    let dev = BlockDevice::new(Path::new("/dev/null")).unwrap();
+    let dev = BlockDevice::new(null_image());
     target.add_lun(Box::new(dev));
 
     do_command_fail_lun(
@@ -116,7 +114,7 @@ fn test_request_sense_descriptor_format() {
 #[test]
 fn test_inquiry() {
     let mut target: EmulatedTarget<Vec<u8>, &[u8]> = EmulatedTarget::new();
-    let dev = BlockDevice::new(Path::new("/dev/null")).unwrap();
+    let dev = BlockDevice::new(null_image());
     target.add_lun(Box::new(dev));
 
     do_command_in_lun(
@@ -160,7 +158,7 @@ fn test_inquiry() {
 #[test]
 fn test_other_command() {
     let mut target: EmulatedTarget<Vec<u8>, &[u8]> = EmulatedTarget::new();
-    let dev = BlockDevice::new(Path::new("/dev/null")).unwrap();
+    let dev = BlockDevice::new(null_image());
     target.add_lun(Box::new(dev));
 
     do_command_fail_lun(
@@ -179,7 +177,7 @@ fn test_other_command() {
 #[test]
 fn test_invalid_command() {
     let mut target: EmulatedTarget<Vec<u8>, &[u8]> = EmulatedTarget::new();
-    let dev = BlockDevice::new(Path::new("/dev/null")).unwrap();
+    let dev = BlockDevice::new(null_image());
     target.add_lun(Box::new(dev));
 
     do_command_fail_lun(

src/scsi/src/scsi/tests/bad_lun.rs

@@ -1,8 +1,8 @@
 //! Tests for stuff shared between commands.
 
-use std::{io::ErrorKind, path::Path};
+use std::io::ErrorKind;
 
-use super::do_command_fail;
+use super::{do_command_fail, test_image};
 use crate::scsi::{
     emulation::{block_device::BlockDevice, EmulatedTarget},
     sense, CmdError, Request, Target, TaskAttr,
@@ -11,7 +11,7 @@ use crate::scsi::{
 #[test]
 fn test_invalid_opcode() {
     let mut target: EmulatedTarget<Vec<u8>, &[u8]> = EmulatedTarget::new();
-    let dev = BlockDevice::new(Path::new("src/scsi/tests/test.img")).unwrap();
+    let dev = BlockDevice::new(test_image());
     target.add_lun(Box::new(dev));
 
     do_command_fail(
@@ -27,7 +27,7 @@ fn test_invalid_opcode() {
 #[test]
 fn test_invalid_service_action() {
     let mut target: EmulatedTarget<Vec<u8>, &[u8]> = EmulatedTarget::new();
-    let dev = BlockDevice::new(Path::new("src/scsi/tests/test.img")).unwrap();
+    let dev = BlockDevice::new(test_image());
     target.add_lun(Box::new(dev));
 
     do_command_fail(
@@ -44,7 +44,7 @@ fn test_invalid_service_action() {
 #[test]
 fn test_short_data_out_buffer() {
     let mut target: EmulatedTarget<&mut [u8], &[u8]> = EmulatedTarget::new();
-    let dev = BlockDevice::new(Path::new("src/scsi/tests/test.img")).unwrap();
+    let dev = BlockDevice::new(test_image());
     target.add_lun(Box::new(dev));
 
     let mut data_in: &mut [u8] = &mut [];
@@ -80,7 +80,7 @@ fn test_short_data_out_buffer() {
 #[test]
 fn test_short_cdb() {
     let mut target: EmulatedTarget<&mut [u8], &[u8]> = EmulatedTarget::new();
-    let dev = BlockDevice::new(Path::new("src/scsi/tests/test.img")).unwrap();
+    let dev = BlockDevice::new(test_image());
     target.add_lun(Box::new(dev));
 
     let mut data_in: &mut [u8] = &mut [];