Fix hg tests

Seldaek · Nov 11, 2024 · 9180bec · 9180bec
1 parent 1d44725
commit 9180bec
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 4 deletions.
diff --git a/src/Monolog/Processor/MercurialProcessor.php b/src/Monolog/Processor/MercurialProcessor.php
@@ -62,13 +62,18 @@ private static function getMercurialInfo(): array
         }
 
         $result = explode(' ', trim((string) shell_exec('hg id -nb')));
-
         if (\count($result) >= 3) {
             return self::$cache = [
                 'branch' => $result[1],
                 'revision' => $result[2],
             ];
         }
+        if (\count($result) === 2) {
+            return self::$cache = [
+                'branch' => $result[1],
+                'revision' => $result[0],
+            ];
+        }
 
         return self::$cache = [];
     }

diff --git a/tests/Monolog/Processor/MercurialProcessorTest.php b/tests/Monolog/Processor/MercurialProcessorTest.php
@@ -15,6 +15,41 @@
 
 class MercurialProcessorTest extends TestCase
 {
+    private string $oldCwd;
+    private string $testDir;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->oldCwd = getcwd();
+        $this->testDir = sys_get_temp_dir().'/monolog-processor-mercurial-test';
+
+        mkdir($this->testDir, recursive: true);
+        chdir($this->testDir);
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        chdir($this->oldCwd);
+
+        if (!file_exists($this->testDir)) {
+            return;
+        }
+        $items = new \RecursiveIteratorIterator(
+            new \RecursiveDirectoryIterator($this->testDir, \RecursiveDirectoryIterator::SKIP_DOTS),
+            \RecursiveIteratorIterator::CHILD_FIRST
+        );
+
+        foreach ($items as $item) {
+            $item->isDir() ? rmdir((string) $item) : unlink((string) $item);
+        }
+
+        rmdir($this->testDir);
+    }
+
     /**
      * @covers Monolog\Processor\MercurialProcessor::__invoke
      */
@@ -31,12 +66,17 @@ public function testProcessor()
             return;
         }
 
-        `hg init`;
+        exec('hg init');
+        exec('hg branch default');
+        touch('test.txt');
+        exec('hg add test.txt');
+        exec('hg commit -u foo -m "initial commit"');
+
         $processor = new MercurialProcessor();
         $record = $processor($this->getRecord());
 
         $this->assertArrayHasKey('hg', $record->extra);
-        $this->assertTrue(!\is_array($record->extra['hg']['branch']));
-        $this->assertTrue(!\is_array($record->extra['hg']['revision']));
+        $this->assertSame('default', $record->extra['hg']['branch']);
+        $this->assertSame('0', $record->extra['hg']['revision']);
     }
 }