Generate tests and remove filter.

OpenMage · May 18, 2020 · 2aed58c · 2aed58c
1 parent 8ff94e7
commit 2aed58c
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -35,7 +35,6 @@ before_install: ./dev/travis/before_install.sh
 install: if [ $TEST_SUITE == "functional" ]; then composer install --no-interaction; fi
 before_script: ./dev/travis/before_script.sh
 script:
-  - test $TEST_SUITE = "functional" && TEST_FILTER='dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php' || true
   - if [ $TEST_SUITE == "static" ]; then ! find . -not \( -path ./.phpstorm.meta.php -prune \) -not \( -path ./lib/PEAR -prune \) -not \( -path ./lib/phpseclib -prune \) -not \( -path ./lib/Zend -prune \) -type f -name "*.php" -exec php -d error_reporting=32767 -l {} \; 2>&1 >&- | grep "^"; fi
   - if [ $TEST_SUITE == "static" ]; then ! find app/design -type f -name "*.phtml" -exec php -d error_reporting=32767 -l {} \; 2>&1 >&- | grep "^"; fi
-  - if [ $TEST_SUITE == "functional" ]; then dev/tests/functional/vendor/phpunit/phpunit/phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
+  - if [ $TEST_SUITE == "functional" ]; then dev/tests/functional/vendor/phpunit/phpunit/phpunit -c dev/tests/$TEST_SUITE; fi
diff --git a/dev/tests/functional/.gitignore b/dev/tests/functional/.gitignore
@@ -1 +1,2 @@
 vendor
+generated
diff --git a/dev/tests/functional/README.md b/dev/tests/functional/README.md
@@ -13,6 +13,15 @@ docker run --rm -it \
   composer --ignore-platform-reqs install
 ```
 
+Then generate tests using PHP:
+
+```sh
+docker run --rm -it \
+  --volume $(realpath $PWD/../../../):/app --workdir /app \
+  php:7.2 \
+    php -f dev/tests/functional/utils/generate.php
+```
+
 Run tests:
 
 ```sh

diff --git a/dev/tests/functional/utils/mtf b/dev/tests/functional/utils/mtf
@@ -8,4 +8,29 @@
 $mtfRoot = dirname(__DIR__);
 $mtfRoot = str_replace('\\', '/', $mtfRoot);
 define('MTF_PHPUNIT_FILE', $mtfRoot . DIRECTORY_SEPARATOR . 'phpunit.xml');
-include $mtfRoot . '/vendor/magento/mtf/utils/mtf';
+
+if (PHP_SAPI !== 'cli') {
+    echo 'utils/mtf must be run as a CLI application';
+    exit(1);
+}
+
+try {
+    require __DIR__ . DIRECTORY_SEPARATOR . 'bootstrap.php';
+} catch (\Exception $e) {
+    echo 'Autoload error: ' . $e->getMessage();
+    exit(1);
+}
+try {
+    #$handler = new \Magento\Framework\App\ErrorHandler();
+    #set_error_handler([$handler, 'handler']);
+    $application = $objectManager->create('Magento\Mtf\Console\Cli');
+    $application->run();
+} catch (\Exception $e) {
+    while ($e) {
+        echo $e->getMessage();
+        echo $e->getTraceAsString();
+        echo "\n\n";
+        $e = $e->getPrevious();
+    }
+    exit(1);
+}
diff --git a/dev/travis/before_script.sh b/dev/travis/before_script.sh
@@ -32,6 +32,9 @@ case $TEST_SUITE in
         cp ./phpunit.xml.dist ./phpunit.xml
         sed -e "s?127.0.0.1?${MAGENTO_HOST_NAME}?g" --in-place ./phpunit.xml
         sed -e "s?basic?travis_acceptance?g" --in-place ./phpunit.xml
+
+        php -f utils/generate.php
+
         cd ./utils
         #php -f mtf troubleshooting:check-all