Bumps deps and ubuntu version in vagrant (mdaffin#44)

* Bumps deps and ubuntu version in vagrant

Fixes some issues caused by this:
- we now get a warning about null pointer derefs caused by bindgen, these are now suppressed until an upstream fix is released
- tests now run serially in the CI system and it is recommended to do the same locally with
- tests now use /dev/loop3 as ubuntu 20.04 already uses 0-2 for snap
- clang added to vagrant
- remove verbose flags in travis
- bumps minimum supported rust version to 1.50.0

Author: mdaffin

.travis.yml

@@ -11,9 +11,9 @@ rust:
   - nightly
   - beta
   - stable
-  - 1.45.0
-  - 1.44.0
-  - 1.43.0
+  - 1.52.0
+  - 1.51.0
+  - 1.50.0
 
 matrix:
   allow_failures:
@@ -30,8 +30,8 @@ env:
 
 script:
   - '[[ "$TRAVIS_RUST_VERSION" != "stable" ]] || cargo clippy -- -D warnings'
-  - cargo build --verbose
-  - sudo -E  env "PATH=$PATH" cargo test --verbose
+  - cargo build
+  - sudo -E  env "PATH=$PATH" cargo test --jobs 1
 
 deploy:
   - provider: script

Cargo.toml

@@ -16,14 +16,14 @@ travis-ci = { repository = "serde-rs/serde" }
 direct_io = []
 
 [dependencies]
-errno = "0.2"
-libc = "0.2"
+errno = "0.2.8"
+libc = "0.2.105"
 
 [build-dependencies]
-bindgen = { version = "0.58.1", default-features = false, features = ["runtime"] }
+bindgen = { version = "0.59.1", default-features = false, features = ["runtime"] }
 
 [dev-dependencies]
-tempfile = "3.1.0"
-lazy_static = "1.3.0"
-serde_json = "1.0.40"
-serde = { version = "1.0.98", features = ["derive"] }
+tempfile = "3.2.0"
+lazy_static = "1.4.0"
+serde_json = "1.0.68"
+serde = { version = "1.0.130", features = ["derive"] }

Vagrantfile

@@ -1,9 +1,9 @@
 Vagrant.configure("2") do |config|
-  config.vm.box = "ubuntu/bionic64"
+  config.vm.box = "ubuntu/focal64"
   config.vm.provision "shell",
     inline: <<-EOS
       curl https://sh.rustup.rs -sSf | sh -s -- -y
-      apt install -y gcc
+      apt update && apt install -y gcc clang
       fallocate -l 128M /tmp/disk.img
       mv /tmp/disk.img /vagrant/
 EOS

src/lib.rs

@@ -1,3 +1,7 @@
+// Supress warnings generated by bindgen: https://github.com/rust-lang/rust-bindgen/issues/1651
+#![allow(deref_nullptr)]
+#![allow(unknown_lints)]
+
 //! Setup and control loop devices.
 //!
 //! Provides rust interface with similar functionality to the Linux utility `losetup`.

tests/integration_test.rs

@@ -14,6 +14,7 @@ use util::{attach_file, create_backing_file, detach_all, list_device, setup};
 
 #[test]
 fn get_next_free_device() {
+    let num_devices_at_start = list_device(None).len();
     let _lock = setup();
 
     let lc = LoopControl::open().expect("should be able to open the LoopControl device");
@@ -23,7 +24,10 @@ fn get_next_free_device() {
 
     assert_eq!(
         ld0.path(),
-        Some(PathBuf::from("/dev/loop0")),
+        Some(PathBuf::from(&format!(
+            "/dev/loop{}",
+            num_devices_at_start
+        ))),
         "should find the first loopback device"
     );
 }
@@ -68,7 +72,7 @@ fn attach_a_backing_file(offset: u64, sizelimit: u64, file_size: i64) {
 
         let file = create_backing_file(file_size);
         let file_path = file.to_path_buf();
-        let mut ld0 = lc
+        let ld0 = lc
             .next_free()
             .expect("should not error finding the next free loopback device");
 
@@ -146,18 +150,19 @@ fn detach_a_backing_file_with_sizelimit_overflow() {
 }
 
 fn detach_a_backing_file(offset: u64, sizelimit: u64, file_size: i64) {
+    let num_devices_at_start = list_device(None).len();
     let _lock = setup();
 
     {
         let file = create_backing_file(file_size);
         attach_file(
-            "/dev/loop0",
+            "/dev/loop3",
             file.to_path_buf().to_str().unwrap(),
             offset,
             sizelimit,
         );
 
-        let ld0 = LoopDevice::open("/dev/loop0")
+        let ld0 = LoopDevice::open("/dev/loop3")
             .expect("should be able to open the created loopback device");
 
         ld0.detach()
@@ -167,11 +172,10 @@ fn detach_a_backing_file(offset: u64, sizelimit: u64, file_size: i64) {
     };
 
     std::thread::sleep(std::time::Duration::from_millis(100));
-    let devices = list_device(None);
 
     assert_eq!(
-        devices.len(),
-        0,
+        list_device(None).len(),
+        num_devices_at_start,
         "there should be no loopback devices mounted"
     );
     detach_all();