Skip to content

Commit 763db0c

Browse files
jhedstromweitzman
authored andcommitted
Fix make tests to not rely on sourceforge (drush-ops#2269)
* Fix make tests to not rely on sourceforge * Skipping one sourceforge-dependent test for now.
1 parent a80d2f0 commit 763db0c

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

tests/makeTest.php

+7-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ function listMakefileTests() {
133133
'name' => 'gzip',
134134
'makefile' => 'gzip.make',
135135
'build' => TRUE,
136-
'md5' => '526332db5456847c316cad7dc6d496f8',
136+
'md5' => '25b514df18a87b655437388af083e22c',
137137
'options' => array('no-core' => NULL),
138138
),
139139
'ignore-checksums' => array(
@@ -596,6 +596,12 @@ function testMakeRecursion() {
596596
}
597597

598598
function testMakeRecursionOverride() {
599+
// @todo This is skipped for now since the test relies on sourceforge.
600+
// It can be replaced if a suitable module that installs projects (not
601+
// libraries, which aren't properly overridable).
602+
$this->markTestSkipped('skipping recursion-override test');
603+
return;
604+
599605
// Silently skip file extraction test if unzip is not installed.
600606
exec('which unzip', $output, $whichUnzipErrorCode);
601607
if (!$whichUnzipErrorCode) {

tests/makefiles/gzip.make

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
api = 2
22
core = 6.x
33

4-
; GeSHi-1.0.8.10.tar.gz contains wrapper folder "geshi/".
5-
; This should move that wrapper folder to sites/all/libraries/geshi/ .
6-
libraries[geshi][destination] = libraries
7-
libraries[geshi][download][type] = get
8-
libraries[geshi][download][url] = http://downloads.sourceforge.net/project/geshi/geshi/GeSHi%201.0.8.10/GeSHi-1.0.8.10.tar.gz
9-
10-
114
; getid3 doesn't contain a wrapper folder. All files are in the root of the archive.
125
libraries[getid3][destination] = libraries
136
libraries[getid3][download][type] = get
14-
libraries[getid3][download][url] = "http://downloads.sourceforge.net/project/getid3/getID3%28%29%201.x/1.9.1/getid3-1.9.1-20110810.zip?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fgetid3%2Ffiles%2FgetID3%2528%2529%25201.x%2F1.9.1%2F&ts=1320871534"
7+
libraries[getid3][download][url] = "https://github.com/JamesHeinrich/getID3/archive/v1.9.8.zip"
158
libraries[getid3][directory_name] = getid3
169
; http://drupal.org/node/1336886
17-
libraries[getid3][patch][] = http://drupal.org/files/getid3-remove-demos-1.9.1.patch
10+
libraries[getid3][patch][] = "https://www.drupal.org/files/issues/1336886-11.patch"

0 commit comments

Comments
 (0)