From 6bc4da8c4c3013bff5d211398bef860f45a582c3 Mon Sep 17 00:00:00 2001 From: vrana Date: Fri, 8 Jun 2012 13:35:52 -0700 Subject: [PATCH] Remove support for skipping tests Summary: Almost revert D2673 but leave the support for 'repeat'. Test Plan: `arc help unit`. Reviewers: epriestley Reviewed By: epriestley CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D2689 --- src/unit/engine/ArcanistBaseUnitTestEngine.php | 10 ---------- src/unit/engine/PhutilUnitTestEngine.php | 10 ---------- src/workflow/ArcanistUnitWorkflow.php | 6 ------ 3 files changed, 26 deletions(-) diff --git a/src/unit/engine/ArcanistBaseUnitTestEngine.php b/src/unit/engine/ArcanistBaseUnitTestEngine.php index b9aa9ca4..2f7473ee 100644 --- a/src/unit/engine/ArcanistBaseUnitTestEngine.php +++ b/src/unit/engine/ArcanistBaseUnitTestEngine.php @@ -25,7 +25,6 @@ abstract class ArcanistBaseUnitTestEngine { private $workingCopy; private $paths; - private $skipFiles; private $arguments = array(); protected $diffID; private $enableAsyncTests; @@ -55,15 +54,6 @@ abstract class ArcanistBaseUnitTestEngine { return $this->paths; } - final public function setSkipFiles(array $paths) { - $this->skipFiles = $paths; - return $this; - } - - final public function getSkipFiles() { - return $this->skipFiles; - } - final public function setArguments(array $arguments) { $this->arguments = $arguments; return $this; diff --git a/src/unit/engine/PhutilUnitTestEngine.php b/src/unit/engine/PhutilUnitTestEngine.php index 4cfa28e6..3027ca46 100644 --- a/src/unit/engine/PhutilUnitTestEngine.php +++ b/src/unit/engine/PhutilUnitTestEngine.php @@ -77,13 +77,6 @@ final class PhutilUnitTestEngine extends ArcanistBaseUnitTestEngine { } while ($library_path != '.'); } - $skip = array(); - foreach ($this->getSkipFiles() as $skip_path) { - $skip_path = Filesystem::resolvePath($skip_path); - $skip_path = Filesystem::readablePath($skip_path, $library_root); - $skip[$skip_path] = true; - } - // Look for any class that extends ArcanistPhutilTestCase inside a // __tests__ directory in any parent directory of every affected file. // @@ -107,9 +100,6 @@ final class PhutilUnitTestEngine extends ArcanistBaseUnitTestEngine { ->selectAndLoadSymbols(); foreach ($symbols as $symbol) { - if (isset($skip[$symbol['where']])) { - continue; - } $run_tests[$symbol['name']] = true; } } diff --git a/src/workflow/ArcanistUnitWorkflow.php b/src/workflow/ArcanistUnitWorkflow.php index d6d7cf82..4dcc44de 100644 --- a/src/workflow/ArcanistUnitWorkflow.php +++ b/src/workflow/ArcanistUnitWorkflow.php @@ -68,11 +68,6 @@ EOTEXT 'help' => "Override configured unit engine for this project." ), - 'skip' => array( - 'param' => 'path', - 'help' => "Specify file paths that will be ignored.", - 'repeat' => true, - ), 'coverage' => array( 'help' => 'Always enable coverage information.', 'conflicts' => array( @@ -132,7 +127,6 @@ EOTEXT $this->engine = newv($engine_class, array()); $this->engine->setWorkingCopy($working_copy); $this->engine->setPaths($paths); - $this->engine->setSkipFiles($this->getArgument('skip')); $this->engine->setArguments($this->getPassthruArgumentsAsMap('unit')); $enable_coverage = null; // Means "default".