WordPress.org

Make WordPress Core

Changeset 925 in tests


Ignore:
Timestamp:
07/19/12 19:17:16 (2 years ago)
Author:
nacin
Message:

phpunit -c multisite now runs the suite as multisite. see #49, #42.

Location:
trunk
Files:
3 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/bin/install.php

    r883 r925  
    88 
    99$config_file_path = $argv[1]; 
     10$multisite = ! empty( $argv[2] ); 
    1011 
    1112$config_dir = dirname( $config_file_path ); 
     
    3031$wpdb->suppress_errors( false ); 
    3132 
    32 $hash = get_option( 'db_version' ) . ' ' . sha1_file( $config_file_path ); 
     33$hash = get_option( 'db_version' ) . ' ' . (int) $multisite . ' ' . sha1_file( $config_file_path ); 
    3334 
    3435if ( $installed && file_exists( WP_TESTS_VERSION_FILE ) && file_get_contents( WP_TESTS_VERSION_FILE ) == $hash ) 
     
    4344wp_install( WP_TESTS_TITLE, 'admin', WP_TESTS_EMAIL, true, null, 'password' ); 
    4445 
    45 if ( defined( 'WP_TESTS_MULTISITE' ) && WP_TESTS_MULTISITE ) { 
     46if ( $multisite ) { 
    4647    echo "Installing network…" . PHP_EOL; 
    4748 
  • trunk/bootstrap.php

    r924 r925  
    4141$PHP_SELF = $GLOBALS['PHP_SELF'] = $_SERVER['PHP_SELF'] = '/index.php'; 
    4242 
    43 system( WP_PHP_BINARY . ' ' . escapeshellarg( dirname( __FILE__ ) . '/bin/install.php' ) . ' ' . escapeshellarg( $config_file_path ) ); 
     43$multisite = (int) ( defined( 'WP_TESTS_MULTISITE') && WP_TESTS_MULTISITE ); 
    4444 
    45 if ( defined( 'WP_TESTS_MULTISITE' ) && WP_TESTS_MULTISITE ) { 
     45system( WP_PHP_BINARY . ' ' . escapeshellarg( dirname( __FILE__ ) . '/bin/install.php' ) . ' ' . escapeshellarg( $config_file_path ) . ' ' . $multisite ); 
     46 
     47if ( $multisite ) { 
    4648    define( 'MULTISITE', true ); 
    4749    define( 'SUBDOMAIN_INSTALL', false ); 
     
    5153    define( 'BLOG_ID_CURRENT_SITE', 1 ); 
    5254    $GLOBALS['base'] = '/'; 
     55} else { 
     56    register_shutdown_function( array( 'WP_PHPUnit_TextUI_Command', 'multisiteWasNotRun' ) ); 
    5357} 
     58unset( $multisite ); 
    5459 
    5560require dirname( __FILE__ ) . '/includes/functions.php'; 
     
    118123        echo PHP_EOL . 'By default, Ajax tests are not run. To execute these, use `phpunit --group ajax`' . PHP_EOL; 
    119124    } 
     125 
     126    static function multisiteWasNotRun() { 
     127        echo PHP_EOL . 'To run the tests using multisite, use `phpunit -c multisite.xml`' . PHP_EOL; 
     128    } 
    120129} 
    121130new WP_PHPUnit_TextUI_Command( $_SERVER['argv'] ); 
  • trunk/multisite

    r924 r925  
    55        strict="true" 
    66        > 
     7    <php> 
     8        <const name="WP_TESTS_MULTISITE" value="1" /> 
     9    </php> 
    710    <testsuites> 
    811        <!-- Default test suite to run all tests --> 
     
    1013            <directory suffix=".php">tests</directory> 
    1114            <file phpVersion="5.3.0">tests/actions/closures.php</file> 
    12             <groups> 
    13                 <exclude> 
    14                     <group>ajax</group> 
    15                 </exclude> 
    16             </groups> 
    1715        </testsuite> 
    1816    </testsuites> 
     17    <groups> 
     18        <exclude> 
     19            <group>ajax</group> 
     20        </exclude> 
     21    </groups> 
    1922</phpunit> 
  • trunk/phpunit.xml

    r924 r925  
    1010            <directory suffix=".php">tests</directory> 
    1111            <file phpVersion="5.3.0">tests/actions/closures.php</file> 
    12             <groups> 
    13                 <exclude> 
    14                     <group>ajax</group> 
    15                 </exclude> 
    16             </groups> 
    1712        </testsuite> 
    1813    </testsuites> 
     14    <groups> 
     15        <exclude> 
     16            <group>ajax</group> 
     17        </exclude> 
     18    </groups> 
    1919</phpunit> 
Note: See TracChangeset for help on using the changeset viewer.