it should be possible to combine a file with a testsuite

1 files changed, 8 insertions, 3 deletions

diff --git a/plugins/TestRunner/Commands/TestsRun.php b/plugins/TestRunner/Commands/TestsRun.php
index 2f262280cb..777536398f 100644
--- a/plugins/TestRunner/Commands/TestsRun.php
+++ b/plugins/TestRunner/Commands/TestsRun.php
@@ -83,23 +83,28 @@ class TestsRun extends ConsoleCommand
             putenv('PIWIK_USE_XHPROF=1');
         }
 
+        $suite    = $this->getTestsuite($input);
         $testFile = $input->getOption('file');
+
         if (!empty($testFile)) {
-            $this->executeTestFile($testFile, $options, $command, $output);
+            $this->executeTestFile($suite, $testFile, $options, $command, $output);
         } else {
-            $suite = $this->getTestsuite($input);
             $this->executeTestGroups($suite, $groups, $options, $command, $output);
         }
 
         return $this->returnVar;
     }
 
-    private function executeTestFile($testFile, $options, $command, OutputInterface $output)
+    private function executeTestFile($suite, $testFile, $options, $command, OutputInterface $output)
     {
         if ('/' !== substr($testFile, 0, 1)) {
             $testFile = '../../' . $testFile;
         }
 
+        if (!empty($suite)) {
+            $options .= ' --testsuite ' . $suite;
+        }
+
         $params = $options . " " . $testFile;
         $this->executeTestRun($command, $params, $output);
     }