diff --git client/pifr_client.test client/pifr_client.test
index 96359b6..344aa29 100644
--- client/pifr_client.test
+++ client/pifr_client.test
@@ -5,7 +5,7 @@
* Provide test of functionality.
*
* NOTE: This test requires that pifr, pifr_client, and pifr_server be enabled
- * and PIFR_DEBUG already set to TRUE.
+ * and PIFR_SHORTCUT_CORE_TEST already set to TRUE.
*
* @author Jimmy Berry ("boombatower", http://drupal.org/user/214218)
*/
diff --git client/pifr_client.xmlrpc.inc client/pifr_client.xmlrpc.inc
index e01dc25..da30827 100644
--- client/pifr_client.xmlrpc.inc
+++ client/pifr_client.xmlrpc.inc
@@ -41,7 +41,7 @@ function pifr_client_xmlrpc_request_next() {
}
watchdog('pifr_client', 'Test request successfull, received: (t: @test_id).', array('@test_id' => $response['test_id']));
- pifr_debug('XML-RPC pifr.next() response: '. var_export($response, TRUE));
+ pifr_debug('XML-RPC pifr.next() response=%response ', array('%response' => var_export($response, TRUE)));
return $response;
}
@@ -66,7 +66,7 @@ function pifr_client_xmlrpc_send_result(array $result) {
}
watchdog('pifr_client', 'Test results successfull sent: (t: @test_id).', array('@test_id' => $result['test_id']));
- pifr_debug('XML-RPC pifr.result() response: '. var_export($response, TRUE));
+ pifr_debug('XML-RPC pifr.result() response=%response ', array('%response' => var_export($response, TRUE)));
return TRUE;
}
diff --git pifr.admin.inc pifr.admin.inc
index cdf2990..71bd723 100644
--- pifr.admin.inc
+++ pifr.admin.inc
@@ -108,9 +108,15 @@ function pifr_admin_configuration_form(&$form_state) {
$form['general']['pifr_debug'] = array(
'#type' => 'checkbox',
'#title' => t('Debug'),
- '#description' => t('Control the output of detailed debug information to the watchdog log. When used on client, only the NonDefaultBlockAdmin will be run. Ensure that this is disabled before finalizing a client.'),
+ '#description' => t('Control the output of detailed debug information to the watchdog log.'),
'#default_value' => PIFR_DEBUG,
);
+ $form['general']['pifr_shortcut_core_test'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Shortcut Drupal core test'),
+ '#description' => t('On a core test, causes only the NonDefaultBlockAdmin test to run, so a testbot can be confirmed easily in testing. Ensure that this is disabled before finalizing a client.'),
+ '#default_value' => PIFR_SHORTCUT_CORE_TEST,
+ );
return system_settings_form($form);
}
diff --git pifr.module pifr.module
index b6714bc..8c0015f 100644
--- pifr.module
+++ pifr.module
@@ -12,6 +12,7 @@
*/
define('PIFR_ACTIVE', variable_get('pifr_active', FALSE));
define('PIFR_DEBUG', variable_get('pifr_debug', FALSE));
+define('PIFR_SHORTCUT_CORE_TEST', variable_get('pifr_shortcut_core_test', FALSE));
/*
* XML-RPC response codes.
@@ -91,9 +92,9 @@ function pifr_response_code($response_code) {
*
* @param string $message Debug message.
*/
-function pifr_debug($message) {
+function pifr_debug($message, $variables = array()) {
if (PIFR_DEBUG) {
- watchdog('pifr_debug', $message);
+ watchdog('pifr_debug', $message, $variables);
}
}
diff --git review/client.inc review/client.inc
index 46359ff..04fd6b1 100644
--- review/client.inc
+++ review/client.inc
@@ -385,11 +385,11 @@ abstract class pifr_client_review {
}
foreach ($this->test['files'] as $file) {
- // Request file from projet server.
+ // Request file from project server.
$response = drupal_http_request($file);
if ($response->code != 200) {
$this->log('Failed to fetch file [' . $file . '], instead received response [' . $response->code . '].');
- $this->set_error(array('@reason' => 'failed to retrieve [' . basename($file) . '] from project client'));
+ $this->set_error(array('@reason' => 'failed to retrieve [' . basename($file) . '] from [' . parse_url($file, PHP_URL_HOST) . ']' ));
return;
}
@@ -666,10 +666,10 @@ abstract class pifr_client_review {
$output = trim(implode("\n", $output));
if ($status != 0) {
- self::$instance->log("Command [$command] failed\n Duration $duration seconds\n Directory [$cwd]\n Status [$status]\n Output: " . ($output ? "output:\n$output" : 'no output') . '.');
+ self::$instance->log("Command [$command] failed\n Duration $duration seconds\n Directory [$cwd]\n Status [$status]\n Output: " . ($output ? "[$output]" : 'no output') . '.');
return FALSE;
}
- self::$instance->log("Command [$command] succeeded\n Duration: $duration seconds\n Directory: [$cwd]\n Completion status: [$status]\n Output: " . ($output ? "output:\n$output" : 'no output') . '.');
+ self::$instance->log("Command [$command] succeeded\n Duration: $duration seconds\n Directory: [$cwd]\n Completion status: [$status]\n Output: " . ($output ? "[$output]" : 'no output') . '.');
return TRUE;
}
}
diff --git review/coder/pifr_coder.client.inc review/coder/pifr_coder.client.inc
index 82d7727..1bbf428 100644
--- review/coder/pifr_coder.client.inc
+++ review/coder/pifr_coder.client.inc
@@ -142,7 +142,7 @@ class pifr_client_review_pifr_coder extends pifr_client_review_pifr_drupal {
}
return $files;
}
- elseif (PIFR_DEBUG) {
+ elseif (PIFR_SHORTCUT_CORE_TEST) {
return array('index.php');
}
return $this->syntax_files();
diff --git review/drupal/pifr_drupal.client.inc review/drupal/pifr_drupal.client.inc
index 27cd679..9372c80 100644
--- review/drupal/pifr_drupal.client.inc
+++ review/drupal/pifr_drupal.client.inc
@@ -55,8 +55,8 @@ class pifr_client_review_pifr_drupal extends pifr_client_review {
$this->core_url = $this->test['review']['argument']['core-url'];
}
- watchdog('pifr_client', 'Test: ' . print_r($test, TRUE));
- $this->log('core_url = [' . $this->core_url . ']; Test repository = [' . $this->test['vcs']['main']['repository']['url'] . ']');
+ watchdog('pifr_client', 'Test: %test
', array('%test' => print_r($test, TRUE)));
+ $this->log('core_url = [' . $this->core_url . '];\n Test repository = [' . $this->test['vcs']['main']['repository']['url'] . ']');
if ($this->test['vcs']['main']['repository']['url'] != $this->core_url) {
// Main repository is not core, so this must be a module test. Move the
// module repository (main) to the dependencies and find the core
diff --git review/simpletest/pifr_simpletest.client.inc review/simpletest/pifr_simpletest.client.inc
index 7054192..d8837ab 100644
--- review/simpletest/pifr_simpletest.client.inc
+++ review/simpletest/pifr_simpletest.client.inc
@@ -201,7 +201,7 @@ class pifr_client_review_pifr_simpletest extends pifr_client_review_pifr_drupal
}
return '--file ' . implode(',', $files);
}
- elseif (PIFR_DEBUG) {
+ elseif (PIFR_SHORTCUT_CORE_TEST) {
return '--class NonDefaultBlockAdmin';
}
return '--all';
diff --git server/pifr_server.xmlrpc.inc server/pifr_server.xmlrpc.inc
index a6ffe45..ffb0e8e 100644
--- server/pifr_server.xmlrpc.inc
+++ server/pifr_server.xmlrpc.inc
@@ -64,11 +64,12 @@ define('PIFR_SERVER_BATCH_MAX_COUNT', 100);
*
*/
function pifr_server_xmlrpc_queue($client_key, $batch) {
- pifr_debug('XML-RPC batch(): received.');
// Check if valid project client.
$client = pifr_server_client_check_key($client_key, PIFR_SERVER_CLIENT_TYPE_PROJECT);
+ pifr_debug('pifr_server_xmlrpc_queue: received batch from client=%client
. Batch=%batch
', array('%client' => print_r($client, TRUE), '%batch' => print_r($batch, TRUE)));
+
if ($client) {
pifr_debug('XML-RPC batch(): valid project client.');
@@ -151,8 +152,8 @@ function pifr_server_xmlrpc_branch_save(array $branches, array $projects, array
$saved = array();
foreach ($branches as $branch) {
if (!isset($projects[$branch['project_identifier']])) {
- pifr_debug(t('XML-RPC batch(): missing project data for branch: (b: @identifier; p: @project_identifier).',
- array('@identifier' => $branch['client_identifier'], '@project_identifier' => $branch['client_identifier'])));
+ pifr_debug('XML-RPC batch(): missing project data for branch: (b: @identifier; p: @project_identifier).',
+ array('@identifier' => $branch['client_identifier'], '@project_identifier' => $branch['client_identifier']));
continue;
}
@@ -199,10 +200,12 @@ function pifr_server_xmlrpc_branch_save(array $branches, array $projects, array
*/
function pifr_server_xmlrpc_file_save(array $files, array $branches, array $client) {
$saved = array();
+ pifr_debug("Received %count files", array('%count' => count($files)));
foreach ($files as $file) {
+ pifr_debug("pifr_server_xmlrpc_file_save: Received file %file
", array('%file' => print_r($file, TRUE)));
if (!isset($branches[$file['branch_identifier']])) {
- pifr_debug(t('XML-RPC batch(): missing branch data for file: (u: @file_url; n: @issue_nid).',
- array('@file_url' => $file['file_url'], '@issue_nid' => $file['issue_nid'])));
+ pifr_debug('XML-RPC batch(): missing branch data for file: (u: @file_url; n: @issue_nid).',
+ array('@file_url' => $file['file_url'], '@issue_nid' => !empty($file['issue_nid']) ? $file['issue_nid'] : 'not provided'));
continue;
}