From 947b8fa4f4c5ee42fc7f1602a7cea1f0f79c8be4 Mon Sep 17 00:00:00 2001 From: Neil Mader Date: Tue, 28 Feb 2017 10:19:28 -0400 Subject: [PATCH 1/4] Change the travis test from Drush to the Drupal script. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6c67e4fb..35511c08 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ script: - $ISLANDORA_DIR/tests/scripts/line_endings.sh sites/all/modules/islandora - drush coder-review --reviews=production,security,style,i18n,potx,sniffer islandora - phpcpd --names *.module,*.inc,*.test sites/all/modules/islandora - - drush test-run --uri=http://localhost:8081 Islandora + - php /var/www/drupal7/scripts/run-tests.sh "Islandora" after_failure: - $ISLANDORA_DIR/tests/scripts/travis_after_failure.sh notifications: From a37217827ae32233619bb1146b9abadd3a438ec7 Mon Sep 17 00:00:00 2001 From: Neil Mader Date: Tue, 28 Feb 2017 10:24:41 -0400 Subject: [PATCH 2/4] Change the travis test from Drush to the Drupal script. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 35511c08..dfba2b53 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ script: - $ISLANDORA_DIR/tests/scripts/line_endings.sh sites/all/modules/islandora - drush coder-review --reviews=production,security,style,i18n,potx,sniffer islandora - phpcpd --names *.module,*.inc,*.test sites/all/modules/islandora - - php /var/www/drupal7/scripts/run-tests.sh "Islandora" + - php scripts/run-tests.sh --php `phpenv which php` --url http://localhost:8081 --verbose "Islandora" after_failure: - $ISLANDORA_DIR/tests/scripts/travis_after_failure.sh notifications: From 00cf5a24966618857bdfa6833c8c370c6f6d62d0 Mon Sep 17 00:00:00 2001 From: Neil Mader Date: Tue, 28 Feb 2017 12:58:37 -0400 Subject: [PATCH 3/4] Sudo is required for the scrips to run, repos before 2015 were grandfathered in. However, this isn't the case for forks. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index dfba2b53..b8370a5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +sudo: required language: php php: - 5.3.3 From d0cd15f4d765bfafcbfb483f30db981539c783df Mon Sep 17 00:00:00 2001 From: Neil Mader Date: Tue, 28 Feb 2017 14:19:49 -0400 Subject: [PATCH 4/4] Added a before_script in travi.yml file to extend mysql wait time to 1200 --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index b8370a5e..1ef09376 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,10 @@ before_install: - export ISLANDORA_DIR=$TRAVIS_BUILD_DIR - $TRAVIS_BUILD_DIR/tests/scripts/travis_setup.sh - cd $HOME/drupal-* +before_script: + # Mysql might time out for long tests, increase the wait timeout. + - mysql -e 'SET @@GLOBAL.wait_timeout=1200' + script: - ant -buildfile sites/all/modules/islandora/build.xml lint - $ISLANDORA_DIR/tests/scripts/line_endings.sh sites/all/modules/islandora