Move tests into the tests directory & run tests on GH Actions

.github/workflows/build-rust.yml

@@ -17,21 +17,24 @@ jobs:
           platform: Linux
           packages:
           - gcc-aarch64-linux-gnu
-          targets:
+          test-targets:
           - x86_64-unknown-linux-gnu
+          targets:
           - aarch64-unknown-linux-gnu
         - os: macos-12
           platform: macOS
-          targets:
+          test-targets:
           - x86_64-apple-darwin
+          targets:
           - aarch64-apple-darwin
           - aarch64-apple-ios
           - aarch64-apple-ios-sim
           - x86_64-apple-ios
         - os: windows-2022
           platform: Windows
-          targets:
+          test-targets:
           - x86_64-pc-windows-msvc
+          targets:
           - aarch64-pc-windows-msvc
     runs-on: ${{ matrix.os }}
     env:
@@ -59,4 +62,7 @@ jobs:
         targets: ${{ join(matrix.targets, ', ') }}
     - name: Build
       shell: bash
-      run: cargo build --verbose --workspace --all-features --target ${{ join(matrix.targets, ' --target ') }}
+      run: cargo build --verbose --workspace --all-features --target ${{ join(matrix.targets, ' --target ') }} --target ${{ join(matrix.test-targets, ' --target ') }}
+    - name: Test
+      shell: bash
+      run: cargo test --verbose --workspace --all-features --target ${{ join(matrix.test-targets, ' --target ') }}

.vscode/settings.json

@@ -8,15 +8,6 @@
     "editor.acceptSuggestionOnEnter": "on",
     "rust-analyzer.restartServerOnConfigChange": true,
     "rust-analyzer.cargo.features": "all",
-    "rust-analyzer.check.overrideCommand": [
-        "cargo",
-        "clippy",
-        "--fix",
-        "--workspace",
-        "--message-format=json",
-        "--all-targets",
-        "--allow-dirty"
-    ],
     "[rust]": {
         "editor.defaultFormatter": "rust-lang.rust-analyzer",
     }

tun/src/tokio/mod.rs

@@ -32,27 +32,3 @@ impl TunInterface {
         }
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use std::net::Ipv4Addr;
-
-    use super::*;
-    #[tokio::test]
-    async fn test_create() {
-        let tun = crate::TunInterface::new().unwrap();
-        let _async_tun = TunInterface::new(tun).unwrap();
-    }
-
-    #[tokio::test]
-    async fn test_write() {
-        let tun = crate::TunInterface::new().unwrap();
-        tun.set_ipv4_addr(Ipv4Addr::from([192, 168, 1, 10]))
-            .unwrap();
-        let async_tun = TunInterface::new(tun).unwrap();
-        let mut buf = [0u8; 1500];
-        buf[0] = 6 << 4;
-        let bytes_written = async_tun.write(&buf).await.unwrap();
-        assert!(bytes_written > 0);
-    }
-}

tun/src/unix/apple/mod.rs

@@ -156,32 +156,3 @@ impl TunInterface {
             .map_err(|_| Error::new(ErrorKind::Other, "Conversion error"))?
     }
 }
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use std::net::Ipv4Addr;
-
-    #[test]
-    fn mtu() {
-        let interf = TunInterface::new().unwrap();
-
-        interf.set_mtu(500).unwrap();
-
-        assert_eq!(interf.mtu().unwrap(), 500);
-    }
-
-    #[test]
-    #[throws]
-    fn netmask() {
-        let interf = TunInterface::new()?;
-
-        let netmask = Ipv4Addr::new(255, 0, 0, 0);
-        let addr = Ipv4Addr::new(192, 168, 1, 1);
-
-        interf.set_ipv4_addr(addr)?;
-        interf.set_netmask(netmask)?;
-
-        assert_eq!(interf.netmask()?, netmask);
-    }
-}

tun/src/unix/linux/mod.rs

@@ -172,32 +172,3 @@ impl TunInterface {
         self.socket.send(buf)?
     }
 }
-
-#[cfg(test)]
-mod test {
-    use super::TunInterface;
-    use std::net::Ipv4Addr;
-
-    #[test]
-    fn mtu() {
-        let interf = TunInterface::new().unwrap();
-
-        interf.set_mtu(500).unwrap();
-
-        assert_eq!(interf.mtu().unwrap(), 500);
-    }
-
-    #[test]
-    #[throws]
-    fn netmask() {
-        let interf = TunInterface::new()?;
-
-        let netmask = Ipv4Addr::new(255, 0, 0, 0);
-        let addr = Ipv4Addr::new(192, 168, 1, 1);
-
-        interf.set_ipv4_addr(addr)?;
-        interf.set_netmask(netmask)?;
-
-        assert_eq!(interf.netmask()?, netmask);
-    }
-}

tun/src/unix/mod.rs

@@ -61,39 +61,4 @@ pub fn string_to_ifname(name: &str) -> [libc::c_char; libc::IFNAMSIZ] {
     let len = name.len().min(buf.len());
     buf[..len].copy_from_slice(unsafe { &*(name.as_bytes() as *const _ as *const [libc::c_char]) });
     buf
-}
-
-#[cfg(test)]
-mod test {
-
-    use super::*;
-
-    use std::net::Ipv4Addr;
-
-    #[throws]
-    #[test]
-    fn tst_read() {
-        // This test is interactive, you need to send a packet to any server through 192.168.1.10
-        // EG. `sudo route add 8.8.8.8 192.168.1.10`,
-        //`dig @8.8.8.8 hackclub.com`
-        let mut tun = TunInterface::new()?;
-        println!("tun name: {:?}", tun.name()?);
-        tun.set_ipv4_addr(Ipv4Addr::from([192, 168, 1, 10]))?;
-        println!("tun ip: {:?}", tun.ipv4_addr()?);
-        println!("Waiting for a packet...");
-        let buf = &mut [0u8; 1500];
-        let res = tun.recv(buf);
-        println!("Received!");
-        assert!(res.is_ok());
-    }
-
-    #[test]
-    #[throws]
-    fn write_packets() {
-        let tun = TunInterface::new()?;
-        let mut buf = [0u8; 1500];
-        buf[0] = 6 << 4;
-        let bytes_written = tun.send(&buf)?;
-        assert_eq!(bytes_written, 1504);
-    }
-}
+}

tun/tests/configure.rs

@@ -1,6 +1,6 @@
 use fehler::throws;
 use std::io::Error;
-use std::net::{Ipv4Addr};
+use std::net::Ipv4Addr;
 use tun::TunInterface;
 
 #[test]
@@ -11,6 +11,7 @@ fn test_create() {
 
 #[test]
 #[throws]
+#[cfg(not(target_os = "windows"))]
 fn test_set_get_ipv4() {
     let tun = TunInterface::new()?;
 
@@ -23,8 +24,10 @@ fn test_set_get_ipv4() {
 
 #[test]
 #[throws]
-#[cfg(target_os = "linux")]
+#[cfg(not(any(target_os = "windows", target_vendor = "apple")))]
 fn test_set_get_ipv6() {
+    use std::net::Ipv6Addr;
+
     let tun = TunInterface::new()?;
 
     let addr = Ipv6Addr::new(1, 1, 1, 1, 1, 1, 1, 1);
@@ -33,3 +36,29 @@ fn test_set_get_ipv6() {
     // let result = tun.ipv6_addr()?;
     // assert_eq!(addr, result);
 }
+
+#[test]
+#[throws]
+#[cfg(not(target_os = "windows"))]
+fn test_set_get_mtu() {
+    let interf = TunInterface::new()?;
+
+    interf.set_mtu(500)?;
+
+    assert_eq!(interf.mtu().unwrap(), 500);
+}
+
+#[test]
+#[throws]
+#[cfg(not(target_os = "windows"))]
+fn test_set_get_netmask() {
+    let interf = TunInterface::new()?;
+
+    let netmask = Ipv4Addr::new(255, 0, 0, 0);
+    let addr = Ipv4Addr::new(192, 168, 1, 1);
+
+    interf.set_ipv4_addr(addr)?;
+    interf.set_netmask(netmask)?;
+
+    assert_eq!(interf.netmask()?, netmask);
+}

tun/tests/packets.rs

@@ -0,0 +1,36 @@
+use fehler::throws;
+use std::io::Error;
+
+use std::net::Ipv4Addr;
+use tun::TunInterface;
+
+#[throws]
+#[test]
+#[ignore = "requires interactivity"]
+#[cfg(not(target_os = "windows"))]
+fn tst_read() {
+    // This test is interactive, you need to send a packet to any server through 192.168.1.10
+    // EG. `sudo route add 8.8.8.8 192.168.1.10`,
+    //`dig @8.8.8.8 hackclub.com`
+    let mut tun = TunInterface::new()?;
+    println!("tun name: {:?}", tun.name()?);
+    tun.set_ipv4_addr(Ipv4Addr::from([192, 168, 1, 10]))?;
+    println!("tun ip: {:?}", tun.ipv4_addr()?);
+    println!("Waiting for a packet...");
+    let buf = &mut [0u8; 1500];
+    let res = tun.recv(buf);
+    println!("Received!");
+    assert!(res.is_ok());
+}
+
+#[test]
+#[throws]
+#[ignore = "requires interactivity"]
+#[cfg(not(target_os = "windows"))]
+fn write_packets() {
+    let tun = TunInterface::new()?;
+    let mut buf = [0u8; 1500];
+    buf[0] = 6 << 4;
+    let bytes_written = tun.send(&buf)?;
+    assert_eq!(bytes_written, 1504);
+}

tun/tests/tokio.rs

@@ -0,0 +1,22 @@
+use std::net::Ipv4Addr;
+
+#[tokio::test]
+#[cfg(all(feature = "tokio", not(target_os = "windows")))]
+async fn test_create() {
+    let tun = tun::TunInterface::new().unwrap();
+    let async_tun = tun::tokio::TunInterface::new(tun).unwrap();
+}
+
+#[tokio::test]
+#[ignore = "requires interactivity"]
+#[cfg(all(feature = "tokio", not(target_os = "windows")))]
+async fn test_write() {
+    let tun = tun::TunInterface::new().unwrap();
+    tun.set_ipv4_addr(Ipv4Addr::from([192, 168, 1, 10]))
+        .unwrap();
+    let async_tun = tun::tokio::TunInterface::new(tun).unwrap();
+    let mut buf = [0u8; 1500];
+    buf[0] = 6 << 4;
+    let bytes_written = async_tun.write(&buf).await.unwrap();
+    assert!(bytes_written > 0);
+}