Merge branch 'hw4' of github.com:htwg-syslab-bsys-ws17/bsys-ws17-template into hw4

hw4/task1/src/unit_test_readproc.rs

 #[cfg(test)]
 mod tests {
     use procinfo::pid::{status, status_self};
-    use {self_pids, get_pid_command, get_thread_count, get_ownprocess_mem, get_task_total};
+    use {get_ownprocess_mem, get_pid_command, get_task_total, get_thread_count, self_pids};
 
 
     fn sol_self_pids() -> (i32, i32) {
         }
     }
 
+    fn name_of_init() -> String {
+        status(1).unwrap().command
+    }
+
+    #[test]
+    fn test_name_of_init() {
+        let status = status(1).unwrap();
+        assert_eq!(name_of_init(), status.command);
+    }
+
     #[test]
     fn test0_ppid() {
         assert_eq!(sol_self_pids(), self_pids().unwrap());
 
     #[test]
     fn test2_command() {
-        assert_eq!(Ok("systemd".to_string()), get_pid_command(1));
+        assert_eq!(Ok(name_of_init()), get_pid_command(1));
     }
 
 
     #[test]
-    fn test3_systemd_command() {
-        let status = status(1).unwrap();
-        assert_eq!("systemd".to_string(), status.command);
-    }
-
-    #[test]
-    fn test4_systemd_threads() {
+    fn test3_systemd_threads() {
         let status = status(1).unwrap();
         assert_eq!(get_thread_count(1), Ok(status.threads));
     }