From e2d6efc6c5eeac5984dee7cc0b800b24d08ee8f9 Mon Sep 17 00:00:00 2001
From: Davide Bertola <dade@dadeb.it>
Date: Thu, 2 Jun 2022 20:30:50 +0200
Subject: [PATCH] rename unload integration test

---
 test/cases/010_load/030_unload/test.ebpf.rs | 10 +++-------
 test/cases/010_load/030_unload/test.rs      |  8 ++------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/test/cases/010_load/030_unload/test.ebpf.rs b/test/cases/010_load/030_unload/test.ebpf.rs
index e3cb6d21..a6ed58dd 100644
--- a/test/cases/010_load/030_unload/test.ebpf.rs
+++ b/test/cases/010_load/030_unload/test.ebpf.rs
@@ -6,13 +6,9 @@
 #![no_std]
 #![no_main]
 
-use aya_bpf::{
-    bindings::xdp_action,
-    macros::xdp,
-    programs::XdpContext,
-};
+use aya_bpf::{bindings::xdp_action, macros::xdp, programs::XdpContext};
 
-#[xdp(name="ihaveaverylongname")]
+#[xdp(name = "test_unload")]
 pub fn pass(ctx: XdpContext) -> u32 {
     match unsafe { try_pass(ctx) } {
         Ok(ret) => ret,
@@ -27,4 +23,4 @@ unsafe fn try_pass(_ctx: XdpContext) -> Result<u32, u32> {
 #[panic_handler]
 fn panic(_info: &core::panic::PanicInfo) -> ! {
     unsafe { core::hint::unreachable_unchecked() }
-}
\ No newline at end of file
+}
diff --git a/test/cases/010_load/030_unload/test.rs b/test/cases/010_load/030_unload/test.rs
index c74dc5fa..c61df552 100755
--- a/test/cases/010_load/030_unload/test.rs
+++ b/test/cases/010_load/030_unload/test.rs
@@ -13,7 +13,7 @@ use std::process::Command;
 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")
+    stdout.contains("test_unload")
 }
 
 fn assert_loaded(loaded: bool) {
@@ -27,11 +27,7 @@ fn assert_loaded(loaded: bool) {
 fn main() {
     println!("Loading XDP program");
     let mut bpf = Bpf::load_file("test.o").unwrap();
-    let dispatcher: &mut Xdp = bpf
-        .program_mut("ihaveaverylongname")
-        .unwrap()
-        .try_into()
-        .unwrap();
+    let dispatcher: &mut Xdp = bpf.program_mut("test_unload").unwrap().try_into().unwrap();
 
     dispatcher.load().unwrap();