revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-12-23 22:10:54 +01:00
Code Issues Releases Wiki Activity

When running phutil tests from "arc unit", trigger __tests__ in all parent

Browse source 
modules

Summary:
Right now, if you add a file to "__tests__/data/blah.testcase" it doesn't
trigger those __tests__, but it should. Trigger __tests__ in all parent modules
when a file changes.

(We could be a little more complex about choosing what to run but all the tests
are super fast so it hardly matters if we run "too many" tests.)

Test Plan: Ran "arc unit" on this, got a test trigger. Added a file to a
__tests__/data/ directory and got a test trigger. Added some var_dump() and
spot-checked things for sanity.

Reviewers: btrahan, jungejason, nh, tuomaspelkonen, aran

Reviewed By: jungejason

CC: aran, jungejason

Differential Revision: 1127
This commit is contained in:
epriestley 2011-11-18 11:27:55 -08:00
parent 18773682c7
commit 994163d9ca
1 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/unit/engine/phutil/PhutilUnitTestEngine.php
View file

@ -27,7 +27,7 @@ class PhutilUnitTestEngine extends ArcanistBaseUnitTestEngine {
$bootloader = PhutilBootloader::getInstance(); $bootloader = PhutilBootloader::getInstance();
$tests = array(); $affected_modules = array();
foreach ($this->getPaths() as $path) { foreach ($this->getPaths() as $path) {
$library_root = phutil_get_library_root_for_path($path); $library_root = phutil_get_library_root_for_path($path);
if (!$library_root) { if (!$library_root) {
@ -45,35 +45,52 @@ class PhutilUnitTestEngine extends ArcanistBaseUnitTestEngine {
} }
$library_path = Filesystem::readablePath($path, $library_root); $library_path = Filesystem::readablePath($path, $library_root);
if (basename($library_path) == '__tests__') { do {
// Add the module and all parent modules as affected modules, which
// means we'll look for __tests__ to run here and in any containing
// module.
$affected_modules[$library_name.':'.$library_path] = array(
'name' => $library_name,
'root' => $library_root,
'path' => $library_path,
);
$library_path = dirname($library_path);
} while ($library_path != '.');
}
$tests = array();
foreach ($affected_modules as $library_info) {
$library_name = $library_info['name'];
$library_root = $library_info['root'];
$module = $library_info['path'];
if (basename($module) == '__tests__') {
// Okay, this is a __tests__ module. // Okay, this is a __tests__ module.
} else { } else {
$exists = $bootloader->moduleExists( $exists = $bootloader->moduleExists(
$library_name, $library_name,
$library_path.'/__tests__'); $module.'/__tests__');
if ($exists) { if ($exists) {
// This is a module which has a __tests__ module in it. // This is a module which has a __tests__ module in it.
$path .= '/__tests__'; $module .= '/__tests__';
} else { } else {
// Look for a parent named __tests__. // Look for a parent named __tests__.
$rpos = strrpos($library_path, '/__tests__'); $rpos = strrpos($module, '/__tests__');
if ($rpos === false) { if ($rpos === false) {
// No tests to run since there is no child or parent module named // No tests to run since there is no child or parent module named
// __tests__. // __tests__.
continue; continue;
} }
// Select the parent named __tests__. // Select the parent named __tests__.
$path = substr($path, 0, $rpos + strlen('/__tests__')); $module = substr($module, 0, $rpos + strlen('/__tests__'));
} }
} }
$module_key = $library_name.':'.$module;
$module_name = Filesystem::readablePath($path, $library_root);
$module_key = $library_name.':'.$module_name;
$tests[$module_key] = array( $tests[$module_key] = array(
'library' => $library_name, 'library' => $library_name,
'root' => $library_root, 'root' => $library_root,
'module' => $module_name, 'module' => $module,
); );
} }