From 02cae49228857cabeba736160b039c1b75095f9b Mon Sep 17 00:00:00 2001 From: Tom Yearke Date: Mon, 1 May 2017 11:31:09 -0400 Subject: [PATCH] Use Git to manage xdmod-test-artifacts --- .travis.build.sh | 3 +++ .travis.install.sh | 13 +++++++++ .travis.yml | 3 +++ composer.json | 5 ---- composer.lock | 27 ++----------------- open_xdmod/modules/xdmod/tests/.gitignore | 1 + .../ETL/Configuration/ConfigurationTest.php | 4 +-- .../Configuration/EtlConfigurationTest.php | 4 +-- .../lib/ETL/Configuration/Rfc6901Test.php | 4 +-- .../tests/lib/ETL/DbModel/DbModelTest.php | 4 +-- open_xdmod/modules/xdmod/tests/runtests.sh | 7 +++++ 11 files changed, 37 insertions(+), 38 deletions(-) create mode 100644 open_xdmod/modules/xdmod/tests/.gitignore diff --git a/.travis.build.sh b/.travis.build.sh index 4538bab1e2..7681d5a2da 100755 --- a/.travis.build.sh +++ b/.travis.build.sh @@ -112,6 +112,9 @@ elif [ "$TEST_SUITE" = "style" ]; then fi done elif [ "$TEST_SUITE" = "unit" ]; then + echo "Copying test artifacts from cached mirror..." + git clone "$TEST_ARTIFACTS_MIRROR" "open_xdmod/modules/xdmod/tests/xdmod-test-artifacts" + open_xdmod/modules/xdmod/tests/runtests.sh if [ $? != 0 ]; then build_exit_value=2 diff --git a/.travis.install.sh b/.travis.install.sh index a0b203135a..ce78be583e 100755 --- a/.travis.install.sh +++ b/.travis.install.sh @@ -37,3 +37,16 @@ source ~/.nvm/nvm.sh nvm install "$NODE_VERSION" nvm use "$NODE_VERSION" npm install + +# Create or update a mirror of the XDMoD test artifacts. +# +# Travis will create any directories that are set up for caching if they do +# not exist, so check if the directory has contents instead of checking for +# the existence of the directory. +if [ -n "$(ls -A "$TEST_ARTIFACTS_MIRROR")" ]; then + echo "Updating XDMoD test artifacts mirror..." + git -C "$TEST_ARTIFACTS_MIRROR" remote update +else + echo "Creating mirror of XDMoD test artifacts..." + git clone --mirror "$TEST_ARTIFACTS_SOURCE" "$TEST_ARTIFACTS_MIRROR" +fi diff --git a/.travis.yml b/.travis.yml index 95382ffe00..95d50e24a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,8 @@ php: env: global: - NODE_VERSION=6 + - TEST_ARTIFACTS_SOURCE="https://github.com/ubccr/xdmod-test-artifacts.git" + - TEST_ARTIFACTS_MIRROR="$HOME/xdmod-test-artifacts.git" matrix: - TEST_SUITE=syntax - TEST_SUITE=style @@ -25,6 +27,7 @@ cache: - $HOME/.npm - $HOME/.composer/cache - /tmp/pear/cache + - $TEST_ARTIFACTS_MIRROR # Delegate the installation step to the custom Travis installation script install: ./.travis.install.sh diff --git a/composer.json b/composer.json index 1bdae1a765..43478ad5c1 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,6 @@ }, "require-dev": { "phpunit/phpunit": "4.8.*", - "ubccr/xdmod-test-artifacts": "@dev", "squizlabs/php_codesniffer": "2.8.0" }, "repositories": [ @@ -369,10 +368,6 @@ "installer-name": "commons-logging" } } - }, - { - "type": "vcs", - "url": "https://github.com/ubccr/xdmod-test-artifacts.git" } ], "extra": { diff --git a/composer.lock b/composer.lock index 94e7855aad..18b9fe9a13 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "d0538f717752f90e1898bee194ced712", + "content-hash": "ceeef77ecbe7a0be2763939f54b3ba06", "packages": [ { "name": "apache/commons-beanutils", @@ -2688,35 +2688,12 @@ "description": "Symfony Yaml Component", "homepage": "https://symfony.com", "time": "2015-07-26T08:59:42+00:00" - }, - { - "name": "ubccr/xdmod-test-artifacts", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/ubccr/xdmod-test-artifacts.git", - "reference": "173dcefc611ba7eabd1aa9aa3c400372e7f9aaf7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ubccr/xdmod-test-artifacts/zipball/f4a08a5244cf41d212e7655b4c87276fb04f2494", - "reference": "173dcefc611ba7eabd1aa9aa3c400372e7f9aaf7", - "shasum": "" - }, - "type": "library", - "description": "Test artifacts for XDMoD and XDMoD submodules", - "support": { - "source": "https://github.com/ubccr/xdmod-test-artifacts/tree/master", - "issues": "https://github.com/ubccr/xdmod-test-artifacts/issues" - }, - "time": "2017-04-26 17:59:22" } ], "aliases": [], "minimum-stability": "stable", "stability-flags": { - "openid/php-openid": 20, - "ubccr/xdmod-test-artifacts": 20 + "openid/php-openid": 20 }, "prefer-stable": false, "prefer-lowest": false, diff --git a/open_xdmod/modules/xdmod/tests/.gitignore b/open_xdmod/modules/xdmod/tests/.gitignore new file mode 100644 index 0000000000..82b5225b47 --- /dev/null +++ b/open_xdmod/modules/xdmod/tests/.gitignore @@ -0,0 +1 @@ +/xdmod-test-artifacts diff --git a/open_xdmod/modules/xdmod/tests/lib/ETL/Configuration/ConfigurationTest.php b/open_xdmod/modules/xdmod/tests/lib/ETL/Configuration/ConfigurationTest.php index 02f73246e9..966cb0b6b3 100644 --- a/open_xdmod/modules/xdmod/tests/lib/ETL/Configuration/ConfigurationTest.php +++ b/open_xdmod/modules/xdmod/tests/lib/ETL/Configuration/ConfigurationTest.php @@ -13,8 +13,8 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase { - const TEST_ARTIFACT_INPUT_PATH = "../../../../vendor/ubccr/xdmod-test-artifacts/xdmod/etlv2/configuration/input"; - const TEST_ARTIFACT_OUTPUT_PATH = "../../../../vendor/ubccr/xdmod-test-artifacts/xdmod/etlv2/configuration/output"; + const TEST_ARTIFACT_INPUT_PATH = "./xdmod-test-artifacts/xdmod/etlv2/configuration/input"; + const TEST_ARTIFACT_OUTPUT_PATH = "./xdmod-test-artifacts/xdmod/etlv2/configuration/output"; /** * Test JSON parse errors diff --git a/open_xdmod/modules/xdmod/tests/lib/ETL/Configuration/EtlConfigurationTest.php b/open_xdmod/modules/xdmod/tests/lib/ETL/Configuration/EtlConfigurationTest.php index 120a16fc23..c5a33cc063 100644 --- a/open_xdmod/modules/xdmod/tests/lib/ETL/Configuration/EtlConfigurationTest.php +++ b/open_xdmod/modules/xdmod/tests/lib/ETL/Configuration/EtlConfigurationTest.php @@ -13,8 +13,8 @@ class EtlConfigurationTest extends \PHPUnit_Framework_TestCase { - const TEST_ARTIFACT_INPUT_PATH = "../../../../vendor/ubccr/xdmod-test-artifacts/xdmod/etlv2/configuration/input"; - const TEST_ARTIFACT_OUTPUT_PATH = "../../../../vendor/ubccr/xdmod-test-artifacts/xdmod/etlv2/configuration/output"; + const TEST_ARTIFACT_INPUT_PATH = "./xdmod-test-artifacts/xdmod/etlv2/configuration/input"; + const TEST_ARTIFACT_OUTPUT_PATH = "./xdmod-test-artifacts/xdmod/etlv2/configuration/output"; const TMPDIR = '/tmp/xdmod-etl-configuration-test'; /** diff --git a/open_xdmod/modules/xdmod/tests/lib/ETL/Configuration/Rfc6901Test.php b/open_xdmod/modules/xdmod/tests/lib/ETL/Configuration/Rfc6901Test.php index f9145bf534..aa5f311d73 100644 --- a/open_xdmod/modules/xdmod/tests/lib/ETL/Configuration/Rfc6901Test.php +++ b/open_xdmod/modules/xdmod/tests/lib/ETL/Configuration/Rfc6901Test.php @@ -14,8 +14,8 @@ class Rfc6901Test extends \PHPUnit_Framework_TestCase { - const TEST_ARTIFACT_INPUT_PATH = "../../../../vendor/ubccr/xdmod-test-artifacts/xdmod/etlv2/configuration/input"; - const TEST_ARTIFACT_OUTPUT_PATH = "../../../../vendor/ubccr/xdmod-test-artifacts/xdmod/etlv2/configuration/output"; + const TEST_ARTIFACT_INPUT_PATH = "./xdmod-test-artifacts/xdmod/etlv2/configuration/input"; + const TEST_ARTIFACT_OUTPUT_PATH = "./xdmod-test-artifacts/xdmod/etlv2/configuration/output"; private $config = null; private $transformer = null; diff --git a/open_xdmod/modules/xdmod/tests/lib/ETL/DbModel/DbModelTest.php b/open_xdmod/modules/xdmod/tests/lib/ETL/DbModel/DbModelTest.php index e68546309d..a71ae93e8f 100644 --- a/open_xdmod/modules/xdmod/tests/lib/ETL/DbModel/DbModelTest.php +++ b/open_xdmod/modules/xdmod/tests/lib/ETL/DbModel/DbModelTest.php @@ -21,8 +21,8 @@ class DbModelTest extends \PHPUnit_Framework_TestCase { - const TEST_ARTIFACT_INPUT_PATH = "../../../../vendor/ubccr/xdmod-test-artifacts/xdmod/etlv2/dbmodel/input"; - const TEST_ARTIFACT_OUTPUT_PATH = "../../../../vendor/ubccr/xdmod-test-artifacts/xdmod/etlv2/dbmodel/output"; + const TEST_ARTIFACT_INPUT_PATH = "./xdmod-test-artifacts/xdmod/etlv2/dbmodel/input"; + const TEST_ARTIFACT_OUTPUT_PATH = "./xdmod-test-artifacts/xdmod/etlv2/dbmodel/output"; private $logger = null; public function __construct() diff --git a/open_xdmod/modules/xdmod/tests/runtests.sh b/open_xdmod/modules/xdmod/tests/runtests.sh index c45030ddd8..e083092e20 100755 --- a/open_xdmod/modules/xdmod/tests/runtests.sh +++ b/open_xdmod/modules/xdmod/tests/runtests.sh @@ -14,5 +14,12 @@ if [ ! -x "$phpunit" ]; then exit 127 fi +artifacts_dir="./xdmod-test-artifacts" +if [ -d "$artifacts_dir" ]; then + git -C "$artifacts_dir" pull +else + git clone "https://github.com/ubccr/xdmod-test-artifacts.git" "$artifacts_dir" +fi + $phpunit ${PHPUNITARGS} . exit $?