Merge pull request #3 from akuzia/error-output

getErrorOutput wont fallback to stdout
muxx · May 13, 2021 · b862a95 · b862a95
2 parents 479bc06 + 6c62b1a
commit b862a95
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/src/Dplr/TaskReport.php b/src/Dplr/TaskReport.php
@@ -92,7 +92,7 @@ public function getOutput(): ?string
     public function getErrorOutput(): ?string
     {
         if (isset($this->data['Stderr'])) {
-            return $this->data['Stderr'] ?: $this->data['Stdout'];
+            return $this->data['Stderr'];
         }
 
         if (isset($this->data['ErrorMsg'])) {

diff --git a/tests/Dplr/Tests/TaskReportTest.php b/tests/Dplr/Tests/TaskReportTest.php
@@ -66,4 +66,35 @@ public function testSuccessful()
         $this->assertNull($taskReport->getErrorOutput());
         $this->assertEquals('output', $taskReport->getOutput());
     }
+
+    public function testNotSuccessfulWithoutStdout()
+    {
+        $taskReport = new TaskReport(
+            [
+                'Type' => TaskReport::TYPE_REPLY,
+                'Success' => false,
+                'Stderr' => 'error',
+            ],
+            new Task(['Action' => 'ssh', 'Cmd' => 'ls -al'])
+        );
+
+        $this->assertFalse($taskReport->isSuccessful());
+        $this->assertEquals('error', $taskReport->getErrorOutput());
+        $this->assertNull($taskReport->getOutput());
+    }
+
+    public function testNotSuccessfulWithoutStderr()
+    {
+        $taskReport = new TaskReport(
+            [
+                'Type' => TaskReport::TYPE_REPLY,
+                'Success' => false,
+            ],
+            new Task(['Action' => 'ssh', 'Cmd' => 'ls -al'])
+        );
+
+        $this->assertFalse($taskReport->isSuccessful());
+        $this->assertNull($taskReport->getErrorOutput());
+        $this->assertNull($taskReport->getOutput());
+    }
 }