Modify test cases so they test the same on Ubuntu and pass on Fedora (#1031)

Author: squell

src/common/resolve.rs

@@ -365,17 +365,23 @@ mod test {
     fn canonicalization() {
         assert_eq!(canonicalize("/").unwrap(), Path::new("/"));
         assert_eq!(canonicalize("").unwrap(), Path::new(""));
-        assert_eq!(
-            canonicalize("/usr/bin/pkill").unwrap(),
-            Path::new("/usr/bin/pkill")
-        );
         if cfg!(any(target_os = "linux", target_os = "macos")) {
+            // this test REQUIRES /usr/bin/unxz to be a symlink for /usr/bin/xz
+            assert_eq!(
+                canonicalize("/usr/bin/unxz").unwrap(),
+                Path::new("/usr/bin/unxz")
+            );
             // this assumes /bin is a symlink on /usr/bin, like it is on modern Debian/Ubuntu
             assert_eq!(
-                canonicalize("/bin/pkill").unwrap(),
-                Path::new("/usr/bin/pkill")
+                canonicalize("/bin/unxz").unwrap(),
+                Path::new("/usr/bin/unxz")
             );
         } else if cfg!(target_os = "freebsd") {
+            // this test REQUIRES /usr/bin/pkill to be a symlink for /usr/bin/pgrep
+            assert_eq!(
+                canonicalize("/usr/bin/pkill").unwrap(),
+                Path::new("/usr/bin/pkill")
+            );
             assert_eq!(canonicalize("/bin/pkill").unwrap(), Path::new("/bin/pkill"));
         } else {
             panic!(

src/system/audit.rs

@@ -119,10 +119,11 @@ mod test {
 
         #[cfg(target_os = "linux")]
         {
-            // /var/log/utmp should be readable, but not secure (writeable by group other than root)
+            // /var/log/wtmp should be readable, but not secure (writeable by group other than root)
             // It doesn't exist on many non-Linux systems however.
-            assert!(std::fs::File::open("/var/log/wtmp").is_ok());
-            assert!(secure_open("/var/log/wtmp", false).is_err());
+            if std::fs::File::open("/var/log/wtmp").is_ok() {
+                assert!(secure_open("/var/log/wtmp", false).is_err());
+            }
         }
 
         // /etc/shadow should not be readable

src/system/interface.rs

@@ -160,39 +160,36 @@ mod test {
     use crate::system::{Group, User, ROOT_GROUP_NAME};
     use std::ffi::CString;
 
-    fn test_user(user: impl UnixUser, name_c: &CStr, uid: UserId) {
+    fn test_user(user: impl UnixUser, name_c: &CStr) {
         let name = name_c.to_str().unwrap();
         assert!(user.has_name(name));
-        assert!(user.has_uid(uid));
         if user.has_name("root") {
             assert!(user.in_group_by_name(CString::new(ROOT_GROUP_NAME).unwrap().as_c_str()));
+            assert!(user.is_root());
         } else {
             assert!(user.in_group_by_name(name_c));
+            assert!(!user.is_root());
         }
         assert_eq!(user.is_root(), name == "root");
     }
 
-    fn test_group(group: impl UnixGroup, name: &str, gid: GroupId) {
-        assert_eq!(group.as_gid(), gid);
+    fn test_group(group: impl UnixGroup, name: &str) {
+        assert_eq!(name == ROOT_GROUP_NAME, group.as_gid() == GroupId::new(0));
         assert_eq!(group.try_as_name(), Some(name));
     }
 
     #[test]
     fn test_unix_user() {
         let user = |name| User::from_name(name).unwrap().unwrap();
-        test_user(user(cstr!("root")), cstr!("root"), UserId::ROOT);
-        test_user(user(cstr!("daemon")), cstr!("daemon"), UserId::new(1));
+        test_user(user(cstr!("root")), cstr!("root"));
+        test_user(user(cstr!("daemon")), cstr!("daemon"));
     }
 
     #[test]
     fn test_unix_group() {
         let group = |name| Group::from_name(name).unwrap().unwrap();
         let root_group_cstr = CString::new(ROOT_GROUP_NAME).unwrap();
-        test_group(
-            group(root_group_cstr.as_c_str()),
-            ROOT_GROUP_NAME,
-            GroupId::new(0),
-        );
-        test_group(group(cstr!("daemon")), "daemon", GroupId::new(1));
+        test_group(group(root_group_cstr.as_c_str()), ROOT_GROUP_NAME);
+        test_group(group(cstr!("daemon")), "daemon");
     }
 }