Remove systemd from travis; Adjust listUnit tests

Author: Andreas Frömer

.travis.yml

@@ -18,8 +18,3 @@ before_script:
 script:
   - composer cs
   - composer test -- --coverage-clover=build/logs/clover.xml --coverage-text
-
-addons:
-  apt:
-    packages:
-    - systemd

src/SystemCtl.php

@@ -72,7 +72,7 @@ public static function unitFromSuffix(string $unitSuffix, string $unitName): Uni
      * @param string[] $unitTypes
      * @return array|\string[]
      */
-    public function listUnits(array $unitTypes = self::AVAILABLE_UNITS): array
+    public function listUnits(array $unitTypes = self::SUPPORTED_UNITS): array
     {
         $process = $this->getProcessBuilder()
             ->add('list-units')
@@ -82,8 +82,8 @@ public function listUnits(array $unitTypes = self::AVAILABLE_UNITS): array
         $output = $process->getOutput();
 
         return array_reduce($unitTypes, function ($carry, $unitSuffix) use ($output) {
-            $carry += Utils\OutputFetcher::fetchUnitNames($unitSuffix, $output);
-            return $carry;
+            $result = Utils\OutputFetcher::fetchUnitNames($unitSuffix, $output);
+            return array_merge($carry, $result);
         }, []);
     }
 

tests/SystemCtlTest.php

@@ -43,11 +43,44 @@ private function buildSystemCtlMock($output)
         return $systemctl;
     }
 
-    public function testListUnits()
+    public function testListUnitsWithAvailableUnits()
     {
-        $systemctl = new SystemCtl();
+        $output = <<<EOT
+  proc-sys-fs-binfmt_misc.timer                      loaded active mounted   Arbitrary Executable File Formats File System
+  run-rpc_pipefs.mount                               loaded active mounted   /run/rpc_pipefs
+  sys-fs-fuse-connections.mount                      loaded active mounted   FUSE Control File System
+  sys-kernel-debug.mount                             loaded active mounted   Debug File System
+  acpid.path                                         loaded active running   ACPI Events Check
+  systemd-ask-password-console.path                  loaded active waiting   Dispatch Password Requests to Console Directory Wa
+  systemd-ask-password-wall.path                     loaded active waiting   Forward Password Requests to Wall Directory Watch
+  acpid.service                                      loaded active running   ACPI event daemon
+  beanstalkd.service                                 loaded active running   Simple, fast work queue
+  console-setup.service                              loaded active exited    LSB: Set console font and keymap
+  cron.service                                       loaded active running   Regular background program processing daemon
+EOT;
+        $systemctl = $this->buildSystemCtlMock($output);
+        $units = $systemctl->listUnits(SystemCtl::AVAILABLE_UNITS);
+        $this->assertCount(11, $units);
+    }
+
+    public function testListUnitsWithSupportedUnits()
+    {
+        $output = <<<EOT
+  proc-sys-fs-binfmt_misc.timer                      loaded active mounted   Arbitrary Executable File Formats File System
+  run-rpc_pipefs.mount                               loaded active mounted   /run/rpc_pipefs
+  sys-fs-fuse-connections.mount                      loaded active mounted   FUSE Control File System
+  sys-kernel-debug.mount                             loaded active mounted   Debug File System
+  acpid.path                                         loaded active running   ACPI Events Check
+  systemd-ask-password-console.path                  loaded active waiting   Dispatch Password Requests to Console Directory Wa
+  systemd-ask-password-wall.path                     loaded active waiting   Forward Password Requests to Wall Directory Watch
+  acpid.service                                      loaded active running   ACPI event daemon
+  beanstalkd.service                                 loaded active running   Simple, fast work queue
+  console-setup.service                              loaded active exited    LSB: Set console font and keymap
+  cron.service                                       loaded active running   Regular background program processing daemon
+EOT;
+        $systemctl = $this->buildSystemCtlMock($output);
         $units = $systemctl->listUnits();
-        $this->assertTrue(count($units) > 0);
+        $this->assertCount(5, $units);
     }
 
     public function testCreateUnitFromSupportedSuffixShouldWord()