Merge branch 'Disasm-fix-tests'

Author: mvirkkunen

tests/test_class_host/tests.rs

@@ -1,3 +1,4 @@
+use std::cmp::max;
 use std::fmt::Write;
 use std::time::{Duration, Instant};
 use libusb::*;
@@ -142,23 +143,25 @@ fn bulk_loopback(dev, _out) {
             data.len(),
             "bulk write len {}", len);
 
-        if *len % 64 == 0 {
+        if *len > 0 && *len % 64 == 0 {
             assert_eq!(
                 dev.write_bulk(0x01, &[], TIMEOUT)
                     .expect(&format!("bulk write zero-length packet")),
                 0,
                 "bulk write zero-length packet");
         }
 
-        let mut response = vec![0u8; *len];
+        // Prevent libusb from instantaneously reading an empty packet on Windows when
+        // zero-sized buffer is passed.
+        let mut response = vec![0u8; max(*len, 1)];
 
         assert_eq!(
             dev.read_bulk(0x81, &mut response, TIMEOUT)
                 .expect(&format!("bulk read len {}", len)),
             data.len(),
             "bulk read len {}", len);
 
-        assert_eq!(&response, &data);
+        assert_eq!(&response[..*len], &data[..]);
     }
 }
 
@@ -172,15 +175,17 @@ fn interrupt_loopback(dev, _out) {
             data.len(),
             "interrupt write len {}", len);
 
-        let mut response = vec![0u8; *len];
+        // Prevent libusb from instantaneously reading an empty packet on Windows when
+        // zero-sized buffer is passed.
+        let mut response = vec![0u8; max(*len, 1)];
 
         assert_eq!(
             dev.read_interrupt(0x82, &mut response, TIMEOUT)
                 .expect(&format!("interrupt read len {}", len)),
             data.len(),
             "interrupt read len {}", len);
 
-        assert_eq!(&response, &data);
+        assert_eq!(&response[..*len], &data[..]);
     }
 }