Page MenuHomePhorge
Files F584921

No OneTemporary
Actions

Size
1 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/includes/composer/PhpUnitSplitter/PhpUnitXmlManager.php b/includes/composer/PhpUnitSplitter/PhpUnitXmlManager.php
index bac35f6649f..33a5b9e00d7 100644
--- a/includes/composer/PhpUnitSplitter/PhpUnitXmlManager.php
+++ b/includes/composer/PhpUnitSplitter/PhpUnitXmlManager.php
@@ -187,7 +187,7 @@ class PhpUnitXmlManager {
return null;
}
$matches = [];
- if ( !preg_match( '/[^\/]+-quibble-[^\/]+/', $logPath, $matches ) ) {
+ if ( !preg_match( '/([^\/]+-)?quibble-[^\/]+/', $logPath, $matches ) ) {
return null;
}
return $serverUrlBase . '/' . $matches[0];
diff --git a/tests/phpunit/unit/includes/composer/PhpUnitSplitter/PhpUnitXmlManagerTest.php b/tests/phpunit/unit/includes/composer/PhpUnitSplitter/PhpUnitXmlManagerTest.php
index 0357cf6b732..3373d233c8c 100644
--- a/tests/phpunit/unit/includes/composer/PhpUnitSplitter/PhpUnitXmlManagerTest.php
+++ b/tests/phpunit/unit/includes/composer/PhpUnitSplitter/PhpUnitXmlManagerTest.php
@@ -117,4 +117,11 @@ class PhpUnitXmlManagerTest extends TestCase {
$url = TestingAccessWrapper::newFromClass( PhpUnitXmlManager::class )->generateResultsCacheUrl( $urlBase, $logPath );
$this->assertEquals( $urlBase . '/mediawiki-quibble-vendor-mysql-php74', $url );
}
+
+ public function testMatchJobPartRegexpQuibbleAtStart() {
+ $urlBase = "https://results-server.example.com/results";
+ $logPath = "47/1113147/8/test/quibble-vendor-mysql-php74-noselenium/96878ad";
+ $url = TestingAccessWrapper::newFromClass( PhpUnitXmlManager::class )->generateResultsCacheUrl( $urlBase, $logPath );
+ $this->assertEquals( $urlBase . '/quibble-vendor-mysql-php74-noselenium', $url );
+ }
}

File Metadata

Mime Type
text/x-diff
Expires
Sat, Jul 5, 5:31 AM (8 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
227409
Default Alt Text
(1 KB)

Event Timeline