test: fix build

test/cases/010_load/030_unload/test.rs

@@ -7,27 +7,26 @@ use aya::{
     programs::{Xdp, XdpFlags},
     Bpf,
 };
+use std::convert::TryInto;
 use std::process::Command;
-use std::{convert::TryInto, process};
-use std::{thread, time};
 
-fn isLoaded() -> bool {
-    let output = Command::new("bpftool").args(&["prog"]).output()?;
+fn is_loaded() -> bool {
+    let output = Command::new("bpftool").args(&["prog"]).output().unwrap();
     let stdout = String::from_utf8(output.stdout).unwrap();
     stdout.contains("xdp  name ihaveaverylongn  tag")
 }
 
-fn assertLoaded(loaded: bool) {
-    let state = isLoaded();
-    if state != loaded {
-        panic!("Expected loaded: {} but was loaded: {}", loaded, state);
-        process::exit(0x100)
+fn assert_loaded(loaded: bool) {
+    let state = is_loaded();
+    if state == loaded {
+        return;
     }
+    panic!("Expected loaded: {} but was loaded: {}", loaded, state);
 }
 
 fn main() {
     println!("Loading XDP program");
-    let mut bpf = Bpf::load_file("name_test.o").unwrap();
+    let mut bpf = Bpf::load_file("test.o").unwrap();
     let dispatcher: &mut Xdp = bpf
         .program_mut("ihaveaverylongname")
         .unwrap()
@@ -38,23 +37,23 @@ fn main() {
 
     let link = dispatcher.attach("eth0", XdpFlags::default()).unwrap();
 
-    dispatcher.unload(false);
+    dispatcher.unload(false).unwrap();
 
-    assertLoaded(true);
+    assert_loaded(true);
 
-    dispatcher.detach(link);
+    dispatcher.detach(link).unwrap();
 
-    assertLoaded(false);
+    assert_loaded(false);
 
     dispatcher.load().unwrap();
 
-    assertLoaded(true);
+    assert_loaded(true);
 
     dispatcher.attach("eth0", XdpFlags::default()).unwrap();
 
-    assertLoaded(true);
+    assert_loaded(true);
 
-    dispatcher.unload(true);
+    dispatcher.unload(true).unwrap();
 
-    assertLoaded(false);
+    assert_loaded(false);
 }

test/cases/010_load/030_unload/test.sh

@@ -2,7 +2,7 @@
 # SUMMARY: Check that long names are properly truncated
 # LABELS:
 
-set -e
+set -ex
 
 # Source libraries. Uncomment if needed/defined
 #. "${RT_LIB}"
@@ -12,7 +12,6 @@ NAME=test
 
 clean_up() {
     rm -rf ebpf user ${NAME}.o ${NAME}
-    exec_vm sudo pkill -9 ${NAME}
     exec_vm rm ${NAME} ${NAME}.o
 }