Index: testing_server_install/patches/core.patch =================================================================== RCS file: testing_server_install/patches/core.patch diff -N testing_server_install/patches/core.patch --- testing_server_install/patches/core.patch 21 Feb 2009 20:44:39 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,43 +0,0 @@ -$Id: core.patch,v 1.1 2009/02/21 20:44:39 thehunmonkgroup Exp $ -Index: install.php -=================================================================== -RCS file: /cvs/drupal/drupal/install.php,v -retrieving revision 1.113.2.7 -diff -u -p -r1.113.2.7 install.php ---- install.php 22 Oct 2008 16:31:37 -0000 1.113.2.7 -+++ install.php 11 Nov 2008 23:40:43 -0000 -@@ -17,6 +17,13 @@ define('MAINTENANCE_MODE', 'install'); - * The installation phase we should proceed to. - */ - function install_main() { -+ // The user agent header is used to pass a database prefix in the request when -+ // running tests. However, for security reasons, it is imperative that no -+ // installation be permitted using such a prefix. -+ if (preg_match("/^simpletest\d+$/", $_SERVER['HTTP_USER_AGENT'])) { -+ header('HTTP/1.1 403 Forbidden'); -+ exit; -+ } - require_once './includes/bootstrap.inc'; - drupal_bootstrap(DRUPAL_BOOTSTRAP_CONFIGURATION); - -Index: modules/system/system.admin.inc -=================================================================== -RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v -retrieving revision 1.63.2.4 -diff -u -p -r1.63.2.4 system.admin.inc ---- modules/system/system.admin.inc 16 Oct 2008 20:23:37 -0000 1.63.2.4 -+++ modules/system/system.admin.inc 11 Nov 2008 23:40:44 -0000 -@@ -625,6 +625,13 @@ function system_modules($form_state = ar - // Get current list of modules. - $files = module_rebuild_cache(); - -+ // Remove hidden modules from display list. -+ foreach ($files as $filename => $file) { -+ if (!empty($file->info['hidden'])) { -+ unset($files[$filename]); -+ } -+ } -+ - uasort($files, 'system_sort_modules_by_info_name'); - - if (!empty($form_state['storage'])) { Index: testing_server_install/patches/simpletest.patch =================================================================== RCS file: testing_server_install/patches/simpletest.patch diff -N testing_server_install/patches/simpletest.patch --- testing_server_install/patches/simpletest.patch 21 Feb 2009 20:44:39 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ -$Id: simpletest.patch,v 1.1 2009/02/21 20:44:39 thehunmonkgroup Exp $ -Index: drupal_web_test_case.php -=================================================================== -RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/drupal_web_test_case.php,v -retrieving revision 1.2.2.3.2.19 -diff -u -p -r1.2.2.3.2.19 drupal_web_test_case.php ---- drupal_web_test_case.php 22 Oct 2008 23:16:46 -0000 1.2.2.3.2.19 -+++ drupal_web_test_case.php 16 Feb 2009 19:34:05 -0000 -@@ -790,9 +790,7 @@ class DrupalWebTestCase { - CURLOPT_SSL_VERIFYPEER => FALSE, - CURLOPT_SSL_VERIFYHOST => FALSE, - ); -- if (preg_match('/simpletest\d+/', $db_prefix)) { -- $curl_options[CURLOPT_USERAGENT] = $db_prefix; -- } -+ $curl_options[CURLOPT_USERAGENT] = 'pifr'; - if (!isset($curl_options[CURLOPT_USERPWD]) && ($auth = variable_get('simpletest_httpauth_username', ''))) { - if ($pass = variable_get('simpletest_httpauth_pass', '')) { - $auth .= ':' . $pass; Index: testing_server_install/patches/settings.php.patch =================================================================== RCS file: testing_server_install/patches/settings.php.patch diff -N testing_server_install/patches/settings.php.patch --- testing_server_install/patches/settings.php.patch 21 Feb 2009 20:44:39 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$Id: settings.php.patch,v 1.1 2009/02/21 20:44:39 thehunmonkgroup Exp $ ---- settings.php 2009-01-12 04:13:09.000000000 +0000 -+++ settings.php.patched 2009-01-12 04:37:04.000000000 +0000 -@@ -169,6 +169,10 @@ ini_set('url_rewriter.tags', ''); - * - * Remove the leading hash signs to enable. - */ -+$GLOBALS['simpletest_installed'] = TRUE; -+if (preg_match("/^simpletest\d+$/", $_SERVER['HTTP_USER_AGENT'])) { -+ $db_prefix = $_SERVER['HTTP_USER_AGENT']; -+} - # $conf = array( - # 'site_name' => 'My Drupal site', - # 'theme_default' => 'minnelli', Index: testing_server_install/install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/testing_server_setup/testing_server_install/install,v retrieving revision 1.9 diff -u -r1.9 install --- testing_server_install/install 23 Feb 2009 00:25:37 -0000 1.9 +++ testing_server_install/install 6 May 2009 22:38:34 -0000 @@ -94,9 +94,6 @@ # Branch of Drupal core we're running. DRUPAL_TAG=DRUPAL-6-9 -# Branch of simpletest we're running. -SIMPLETEST_TAG=DRUPAL-6--2-5 - # Branch of PIFR we're running. PIFR_TAG=DRUPAL-6--1 @@ -398,17 +395,6 @@ mkdir -p $DRUPAL_MODULES fi -# Checkout Simpletest. -if [ ! -f $DRUPAL_MODULES/simpletest/simpletest.module ]; then - echo "Checking out Simpletest tag $SIMPLETEST_TAG" - cd $DRUPAL_MODULES - $CVS -z6 -Q -d:pserver:anonymous:anonymous@cvs.drupal.org:/cvs/drupal-contrib checkout -d simpletest -r $SIMPLETEST_TAG contributions/modules/simpletest -else - echo "Updating Simpletest tag $SIMPLETEST_TAG" - cd $DRUPAL_MODULES/simpletest - $CVS -Q update -dP -r $SIMPLETEST_TAG -fi - # Checkout PIFR. if [ ! -f $DRUPAL_MODULES/project_issue_file_review/pifr.module ]; then echo "Checking out Project issue file review tag $PIFR_TAG" @@ -429,13 +415,6 @@ ln -s ./sites/default/files/checkout . fi -# Set up simpletest directory. -# TODO: This section can be removed if we ever get an install profile working. -if [ ! -d $DRUPAL_ROOT/sites/default/files/simpletest ]; then - echo "Setting up simpletest directory" - mkdir -p $DRUPAL_ROOT/sites/default/files/simpletest -fi - # Set up settings.php if [ ! -f $DRUPAL_ROOT/sites/default/settings.php ]; then echo "Setting up settings.php" @@ -453,30 +432,6 @@ chmod 444 $DRUPAL_ROOT/sites/default/settings.php chown -R $APACHE_USER.$TESTING_ADMIN_GROUP $DRUPAL_ROOT/sites/default/files -# Patch simpletest. -cd $DRUPAL_MODULES/simpletest -SIMPLETEST_PATCHED=`cvs -q diff -up | grep '^+'` -if [ ! "$SIMPLETEST_PATCHED" ]; then - echo "Patching simpletest" - $PATCH -s -p0 < $TESTING_INSTALL_DIR/patches//simpletest.patch -fi - -# Patch core for simpletest. -cd $DRUPAL_ROOT -CORE_PATCHED=`cvs -q diff -up | grep '^+'` -if [ ! "$CORE_PATCHED" ]; then - echo "Patching Drupal core for simpletest" - $PATCH -s -p0 < $TESTING_INSTALL_DIR/patches/core.patch -fi - -# Patch settings.php for simpletest. -cd $DRUPAL_ROOT/sites/default -SETTINGS_PHP_PATCHED=`cat settings.php | grep "\$GLOBALS\['simpletest_installed'\] = TRUE;"` -if [ ! "$SETTINGS_PHP_PATCHED" ]; then - echo "Patching settings.php for simpletest" - $PATCH -s settings.php < $TESTING_INSTALL_DIR/patches/settings.php.patch -fi - ############################################################################## # END DRUPAL WORK ##############################################################################