Changeset 45762

Timestamp:

08/07/2019 11:54:22 AM (6 years ago)

Author:

pento

Message:

Build Tools: Switch all Travis PHPUnit jobs over to Docker-based PHP.

Additionally, there are a handful of related minor changes in this commit:

• .travis.yml has been tidied up a little.
• [45745] was incorrectly marking Travis jobs as passed when some PHPUnit runs failed.
• Add the LOCAL_PHP_MEMCACHED environment variable, for enabling Memcached.
• Add the env:pull NPM script, for refreshing Docker images.

See #47767.

Location:

trunk

Files:

• .env (modified) (1 diff)
• .travis.yml (modified) (6 diffs)
• package.json (modified) (1 diff)
• tests/phpunit/includes/object-cache.php (modified) (1 diff)
• tests/phpunit/tests/ajax/CustomizeMenus.php (modified) (2 diffs)
• tools/local-env/docker-compose.scripts.yml (modified) (2 diffs)
• tools/local-env/docker-compose.yml (modified) (1 diff)

trunk/.env

@@ -19 +19 @@
 LOCAL_PHP_XDEBUG=false
 
+# Whether or not to enable Memcached.
+LOCAL_PHP_MEMCACHED=false
+
 # The MySQL version to use. See https://hub.docker.com/_/mysql/ for valid versions.
 LOCAL_MYSQL=5.7

trunk/.travis.yml

@@ -18 +18 @@
 env:
   global:
-    - LOCAL_DIR=build
+    - LOCAL_DIR: build
 
 matrix:
   include:
   - env: WP_TRAVISCI=test:e2e
+    name: E2E Tests
   - env: WP_TRAVISCI=travis:phpcs
+    name: PHP Linting
   - env: WP_TRAVISCI=travis:js
+    name: JS Tests
   - env: LOCAL_PHP=7.3-fpm WP_TRAVISCI=test:php
-  - php: 7.3
-    dist: trusty
-    env: WP_TRAVIS_OBJECT_CACHE=true WP_TRAVISCI=travis:phpunit
-    services: memcached
+    name: "PHPUnit Tests: PHP 7.3"
+  - env: LOCAL_PHP=7.3-fpm LOCAL_PHP_MEMCACHED=true WP_TRAVISCI=test:php
+    name: "PHPUnit Tests: PHP 7.3 with Memcached"
   - env: LOCAL_PHP=7.2-fpm WP_TRAVISCI=test:php
+    name: "PHPUnit Tests: PHP 7.2"
   - env: LOCAL_PHP=7.1-fpm WP_TRAVISCI=test:php
+    name: "PHPUnit Tests: PHP 7.1"
   - env: LOCAL_PHP=7.0-fpm WP_TEST_REPORTER=true WP_TRAVISCI=test:php
+    name: "PHPUnit Tests: PHP 7.0"
   - env: LOCAL_PHP=5.6-fpm WP_TRAVISCI=test:php
-  - php: 7.4snapshot
-    dist: trusty
-    env: WP_TRAVISCI=travis:phpunit
-  - php: nightly
-    dist: trusty
-    env: WP_TRAVISCI=travis:phpunit
+    name: "PHPUnit Tests: PHP 5.6"
+  - env: LOCAL_PHP=7.4-fpm WP_TRAVISCI=test:php
+    name: "PHPUnit Tests: PHP 7.4"
+  - env: LOCAL_PHP=8.0-fpm WP_TRAVISCI=test:php
+    name: "PHPUnit Tests: PHP 8.0"
   allow_failures:
-  - php: 7.4snapshot
-  - php: nightly
+  - env: LOCAL_PHP=7.4-fpm WP_TRAVISCI=test:php
+  - env: LOCAL_PHP=8.0-fpm WP_TRAVISCI=test:php
   fast_finish: true
 
 before_install:
-- |
-  if [[ "$WP_TRAVISCI" == "travis:phpunit" ]]; then
-      mysql -u root -e "CREATE DATABASE wordpress_tests;"
-      cp wp-tests-config-sample.php wp-tests-config.php
-      sed -i "s/youremptytestdbnamehere/wordpress_tests/" wp-tests-config.php
-      sed -i "s/yourusernamehere/root/" wp-tests-config.php
-      sed -i "s/yourpasswordhere//" wp-tests-config.php
-      travis_retry svn checkout https://plugins.svn.wordpress.org/wordpress-importer/tags/0.6.3/ tests/phpunit/data/plugins/wordpress-importer
-  fi
 - |
   if [[ "$WP_TRAVISCI" == "test:php" ]]; then
@@ -62 +57 @@
       sed -i "s/yourpasswordhere/password/" wp-tests-config.php
       sed -i "s/localhost/mysql/" wp-tests-config.php
+      echo "define( 'FS_METHOD', 'direct' );" >> wp-tests-config.php
       travis_retry svn checkout https://plugins.svn.wordpress.org/wordpress-importer/tags/0.6.3/ tests/phpunit/data/plugins/wordpress-importer
   fi
@@ -69 +65 @@
   chmod +x docker-compose
   sudo mv docker-compose /usr/local/bin
-- |
-  if [[ "$WP_TRAVIS_OBJECT_CACHE" == "true" ]]; then
-    cp tests/phpunit/includes/object-cache.php src/wp-content/object-cache.php
-    echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-  fi
 
 before_script:
@@ -108 +99 @@
     npm run env:start
     npm run build
+    docker-compose -f tools/local-env/docker-compose.yml run --rm mysql mysql --version
+    docker-compose -f tools/local-env/docker-compose.yml run --rm php php --version
+    docker-compose -f tools/local-env/docker-compose.yml run --rm php php -m
+    docker-compose -f tools/local-env/docker-compose.yml -f tools/local-env/docker-compose.scripts.yml run --rm phpunit phpunit --version
+  fi
+- |
+  if [[ "$LOCAL_PHP_MEMCACHED" == "true" ]]; then
+    cp tests/phpunit/includes/object-cache.php build/wp-content/object-cache.php
+    docker run --name memcached --net local-env_wpdevnet -d memcached
   fi
 - |
@@ -113 +113 @@
     npm run env:install
   fi
-- mysql --version
-- phpenv versions
-- php --version
-- php -m
 - npm --version
 - node --version
-- which phpunit
-- phpunit --version
 - curl --version
 - git --version
@@ -131 +125 @@
       npm run test:e2e
     elif [[ "$WP_TRAVISCI" == "test:php" ]]; then
-      npm run test:php -- -- -- --verbose -c phpunit.xml.dist
-      npm run test:php -- -- -- --verbose -c phpunit.xml.dist --group ajax
-      npm run test:php -- -- -- --verbose -c tests/phpunit/multisite.xml
-      npm run test:php -- -- -- --verbose -c tests/phpunit/multisite.xml --group ms-files
-      npm run test:php -- -- -- --verbose -c phpunit.xml.dist --group external-http
+      npm run test:php -- -- -- --verbose -c phpunit.xml.dist &&
+      npm run test:php -- -- -- --verbose -c phpunit.xml.dist --group ajax &&
+      npm run test:php -- -- -- --verbose -c tests/phpunit/multisite.xml &&
+      npm run test:php -- -- -- --verbose -c tests/phpunit/multisite.xml --group ms-files &&
+      npm run test:php -- -- -- --verbose -c phpunit.xml.dist --group external-http &&
       npm run test:php -- -- -- --verbose -c phpunit.xml.dist --group restapi-jsclient
     else

trunk/package.json

@@ -148 +148 @@
         "env:__cli-next": "docker-compose -f ./tools/local-env/docker-compose.yml -f ./tools/local-env/docker-compose.scripts.yml run --rm cli",
         "env:logs": "docker-compose -f ./tools/local-env/docker-compose.yml -f ./tools/local-env/docker-compose.scripts.yml logs",
+        "env:pull": "dotenv npm run env:__pull-next",
+        "env:__pull-next": "docker-compose -f ./tools/local-env/docker-compose.yml -f ./tools/local-env/docker-compose.scripts.yml pull",
         "test:e2e": "dotenv npm run test:__e2e-next",
         "test:__e2e-next": "cross-var cross-env WP_BASE_URL=http://localhost:$LOCAL_PORT wp-scripts test-e2e --config tests/e2e/jest.config.js",

trunk/tests/phpunit/includes/object-cache.php

@@ -836 +836 @@
             $this->servers = $memcached_servers;
         } else {
-            $this->servers = array( array( '127.0.0.1', 11211 ) );
+            $this->servers = array( array( 'memcached', 11211 ) );
         }
 

trunk/tests/phpunit/tests/ajax/CustomizeMenus.php

@@ -55 +55 @@
         if ( 'administrator' !== $role ) {
             // If we're not an admin, we should get a wp_die(-1).
-            $this->setExpectedException( 'WPAjaxDieStopException' );
+            $this->setExpectedException( 'WPAjaxDieStopException', '-1' );
         }
 
@@ -444 +444 @@
         if ( 'administrator' !== $role ) {
             // If we're not an admin, we should get a wp_die(-1).
-            $this->setExpectedException( 'WPAjaxDieStopException' );
+            $this->setExpectedException( 'WPAjaxDieStopException', '-1' );
         }
 

trunk/tools/local-env/docker-compose.scripts.yml

@@ -14 +14 @@
     environment:
       LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false}
+      LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false}
 
     volumes:
@@ -32 +33 @@
     environment:
       LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false}
+      LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false}
 
     volumes:

trunk/tools/local-env/docker-compose.yml

@@ -39 +39 @@
     environment:
       LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false}
+      LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false}
 
     volumes: