DRY: ProcessCreateTime::now() was an almost-copy of SystemTime and only used in one test, we can move the unit test so it doesn't require special access functions

Author: squell

src/system/mod.rs

@@ -978,14 +978,6 @@ mod tests {
         assert!(super::Process::tty_device_id(WithProcess::Current).is_ok());
     }
 
-    #[test]
-    fn get_process_start_time() {
-        let time = super::Process::starting_time(WithProcess::Current).unwrap();
-        let now = super::ProcessCreateTime::now().unwrap();
-        assert!(time.secs() > now.secs() - 24 * 60 * 60);
-        assert!(time < now);
-    }
-
     #[test]
     fn pgid_test() {
         use super::{getpgid, setpgid};

src/system/time.rs

@@ -118,37 +118,6 @@ impl ProcessCreateTime {
         }
     }
 
-    #[cfg(test)]
-    pub(super) fn now() -> std::io::Result<ProcessCreateTime> {
-        let mut spec = MaybeUninit::<libc::timespec>::uninit();
-        // SAFETY: valid pointer is passed to clock_gettime
-        crate::cutils::cerr(unsafe {
-            libc::clock_gettime(
-                if cfg!(target_os = "freebsd") {
-                    libc::CLOCK_REALTIME
-                } else {
-                    libc::CLOCK_BOOTTIME
-                },
-                spec.as_mut_ptr(),
-            )
-        })?;
-        // SAFETY: The `libc::clock_gettime` will correctly initialize `spec`,
-        // otherwise it will return early with the `?` operator.
-        let spec = unsafe { spec.assume_init() };
-
-        // the below conversion is not as useless as clippy thinks, on 32bit systems
-        #[allow(clippy::useless_conversion)]
-        Ok(ProcessCreateTime::new(
-            spec.tv_sec.into(),
-            spec.tv_nsec.into(),
-        ))
-    }
-
-    #[cfg(test)]
-    pub(super) fn secs(&self) -> i64 {
-        self.secs
-    }
-
     pub(super) fn encode(&self, target: &mut impl Write) -> std::io::Result<()> {
         let secs = self.secs.to_ne_bytes();
         let nsecs = self.nsecs.to_ne_bytes();
@@ -203,4 +172,18 @@ mod tests {
             SystemTime::new(6, 500_000_000)
         );
     }
+
+    #[test]
+    fn get_process_start_time() {
+        use crate::system::{Process, WithProcess};
+        let time = Process::starting_time(WithProcess::Current).unwrap();
+
+        let now = {
+            let super::SystemTime { secs, nsecs } = super::SystemTime::now().unwrap();
+            super::ProcessCreateTime { secs, nsecs }
+        };
+
+        assert!(time.secs > now.secs - 24 * 60 * 60);
+        assert!(time < now);
+    }
 }