<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Tests][925] trunk: `phpunit -c multisite` now runs the suite as multisite.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://unit-tests.trac.wordpress.org/changeset/925">925</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-07-19 19:17:16 +0000 (Thu, 19 Jul 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>`phpunit -c multisite` now runs the suite as multisite. see <a href="http://unit-tests.trac.wordpress.org/ticket/49">#49</a>, <a href="http://unit-tests.trac.wordpress.org/ticket/42">#42</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbininstallphp">trunk/bin/install.php</a></li>
<li><a href="#trunkbootstrapphp">trunk/bootstrap.php</a></li>
<li><a href="#trunkphpunitxml">trunk/phpunit.xml</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkmultisite">trunk/multisite</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/bin/install.php (924 => 925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bin/install.php 2012-07-19 18:18:12 UTC (rev 924)
+++ trunk/bin/install.php 2012-07-19 19:17:16 UTC (rev 925)
</span><span class="lines">@@ -7,6 +7,7 @@
</span><span class="cx"> error_reporting( E_ALL & ~E_DEPRECATED & ~E_STRICT );
</span><span class="cx">
</span><span class="cx"> $config_file_path = $argv[1];
</span><ins>+$multisite = ! empty( $argv[2] );
</ins><span class="cx">
</span><span class="cx"> $config_dir = dirname( $config_file_path );
</span><span class="cx">
</span><span class="lines">@@ -29,7 +30,7 @@
</span><span class="cx"> $installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );
</span><span class="cx"> $wpdb->suppress_errors( false );
</span><span class="cx">
</span><del>-$hash = get_option( 'db_version' ) . ' ' . sha1_file( $config_file_path );
</del><ins>+$hash = get_option( 'db_version' ) . ' ' . (int) $multisite . ' ' . sha1_file( $config_file_path );
</ins><span class="cx">
</span><span class="cx"> if ( $installed && file_exists( WP_TESTS_VERSION_FILE ) && file_get_contents( WP_TESTS_VERSION_FILE ) == $hash )
</span><span class="cx"> return;
</span><span class="lines">@@ -42,7 +43,7 @@
</span><span class="cx"> echo "Installing…" . PHP_EOL;
</span><span class="cx"> wp_install( WP_TESTS_TITLE, 'admin', WP_TESTS_EMAIL, true, null, 'password' );
</span><span class="cx">
</span><del>-if ( defined( 'WP_TESTS_MULTISITE' ) && WP_TESTS_MULTISITE ) {
</del><ins>+if ( $multisite ) {
</ins><span class="cx"> echo "Installing network…" . PHP_EOL;
</span><span class="cx">
</span><span class="cx"> define( 'WP_INSTALLING_NETWORK', true );
</span></span></pre></div>
<a id="trunkbootstrapphp"></a>
<div class="modfile"><h4>Modified: trunk/bootstrap.php (924 => 925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bootstrap.php 2012-07-19 18:18:12 UTC (rev 924)
+++ trunk/bootstrap.php 2012-07-19 19:17:16 UTC (rev 925)
</span><span class="lines">@@ -40,9 +40,11 @@
</span><span class="cx"> $_SERVER['HTTP_HOST'] = WP_TESTS_DOMAIN;
</span><span class="cx"> $PHP_SELF = $GLOBALS['PHP_SELF'] = $_SERVER['PHP_SELF'] = '/index.php';
</span><span class="cx">
</span><del>-system( WP_PHP_BINARY . ' ' . escapeshellarg( dirname( __FILE__ ) . '/bin/install.php' ) . ' ' . escapeshellarg( $config_file_path ) );
</del><ins>+$multisite = (int) ( defined( 'WP_TESTS_MULTISITE') && WP_TESTS_MULTISITE );
</ins><span class="cx">
</span><del>-if ( defined( 'WP_TESTS_MULTISITE' ) && WP_TESTS_MULTISITE ) {
</del><ins>+system( WP_PHP_BINARY . ' ' . escapeshellarg( dirname( __FILE__ ) . '/bin/install.php' ) . ' ' . escapeshellarg( $config_file_path ) . ' ' . $multisite );
+
+if ( $multisite ) {
</ins><span class="cx"> define( 'MULTISITE', true );
</span><span class="cx"> define( 'SUBDOMAIN_INSTALL', false );
</span><span class="cx"> define( 'DOMAIN_CURRENT_SITE', WP_TESTS_DOMAIN );
</span><span class="lines">@@ -50,7 +52,10 @@
</span><span class="cx"> define( 'SITE_ID_CURRENT_SITE', 1 );
</span><span class="cx"> define( 'BLOG_ID_CURRENT_SITE', 1 );
</span><span class="cx"> $GLOBALS['base'] = '/';
</span><ins>+} else {
+ register_shutdown_function( array( 'WP_PHPUnit_TextUI_Command', 'multisiteWasNotRun' ) );
</ins><span class="cx"> }
</span><ins>+unset( $multisite );
</ins><span class="cx">
</span><span class="cx"> require dirname( __FILE__ ) . '/includes/functions.php';
</span><span class="cx">
</span><span class="lines">@@ -117,5 +122,9 @@
</span><span class="cx"> static function ajaxTestsWereNotRun() {
</span><span class="cx"> echo PHP_EOL . 'By default, Ajax tests are not run. To execute these, use `phpunit --group ajax`' . PHP_EOL;
</span><span class="cx"> }
</span><ins>+
+ static function multisiteWasNotRun() {
+ echo PHP_EOL . 'To run the tests using multisite, use `phpunit -c multisite.xml`' . PHP_EOL;
+ }
</ins><span class="cx"> }
</span><span class="cx"> new WP_PHPUnit_TextUI_Command( $_SERVER['argv'] );
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkmultisitefromrev924trunkphpunitxml"></a>
<div class="copfile"><h4>Copied: trunk/multisite (from rev 924, trunk/phpunit.xml) (0 => 925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/multisite (rev 0)
+++ trunk/multisite 2012-07-19 19:17:16 UTC (rev 925)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<phpunit
+ bootstrap="bootstrap.php"
+ backupGlobals="false"
+ colors="true"
+ strict="true"
+ >
+ <php>
+ <const name="WP_TESTS_MULTISITE" value="1" />
+ </php>
+ <testsuites>
+ <!-- Default test suite to run all tests -->
+ <testsuite>
+ <directory suffix=".php">tests</directory>
+ <file phpVersion="5.3.0">tests/actions/closures.php</file>
+ </testsuite>
+ </testsuites>
+ <groups>
+ <exclude>
+ <group>ajax</group>
+ </exclude>
+ </groups>
+</phpunit>
</ins></span></pre></div>
<a id="trunkphpunitxml"></a>
<div class="modfile"><h4>Modified: trunk/phpunit.xml (924 => 925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/phpunit.xml 2012-07-19 18:18:12 UTC (rev 924)
+++ trunk/phpunit.xml 2012-07-19 19:17:16 UTC (rev 925)
</span><span class="lines">@@ -9,11 +9,11 @@
</span><span class="cx"> <testsuite>
</span><span class="cx"> <directory suffix=".php">tests</directory>
</span><span class="cx"> <file phpVersion="5.3.0">tests/actions/closures.php</file>
</span><del>- <groups>
- <exclude>
- <group>ajax</group>
- </exclude>
- </groups>
</del><span class="cx"> </testsuite>
</span><span class="cx"> </testsuites>
</span><ins>+ <groups>
+ <exclude>
+ <group>ajax</group>
+ </exclude>
+ </groups>
</ins><span class="cx"> </phpunit>
</span></span></pre>
</div>
</div>
</body>
</html>