diff --git a/pift.admin.inc b/pift.admin.inc
index f254b66..5d188b4 100644
--- a/pift.admin.inc
+++ b/pift.admin.inc
@@ -10,7 +10,7 @@
/**
* PIFT settings.
*/
-function pift_admin_settings_form() {
+function pift_admin_settings_form($form, &$form_state) {
$form = array();
$form['general'] = array(
@@ -65,7 +65,7 @@ function pift_admin_settings_form() {
$form['interface']['pift_followup_fail'] = array(
'#type' => 'select',
'#title' => t('Followup issue status - fail'),
- '#description' => t('The status to set an issue to when a test result meets all of the following criteria.' . theme('item_list', $criteria)),
+ '#description' => t('The status to set an issue to when a test result meets all of the following criteria.' . theme('item_list', array('items' => $criteria))),
'#default_value' => PIFT_FOLLOWUP_FAIL,
'#options' => project_issue_state(),
'#required' => TRUE,
@@ -79,24 +79,27 @@ function pift_admin_settings_form() {
'#required' => TRUE,
);
- $project_types = array();
- foreach (project_get_project_types() as $key => $project_type) {
- $project_types[$key] = $project_type->name;
- }
- $form['results'] = array(
- '#type' => 'fieldset',
- '#title' => t('Results Display'),
- '#weight' => 0,
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- );
- $form['results']['pift_results_display'] = array(
- '#type' => 'checkboxes',
- '#title' => t('Project types'),
- '#description' => t('Project types for which the "Testing Status" tab should be displayed on the project page.'),
- '#options' => $project_types,
- '#default_value' => variable_get('pift_results_display', array()),
- );
+ // Removing for the D7 port, as the plan is to move the 'Automated Testing'
+ // tab interface over to the Conduit project
+ //$project_types = array();
+ //array();
+ //foreach (project_project_node_types() as $key => $project_type) {
+ // $project_types[$project_type] = $project_type;
+ //}
+ //$form['results'] = array(
+ // '#type' => 'fieldset',
+ // '#title' => t('Results Display'),
+ // '#weight' => 0,
+ // '#collapsible' => TRUE,
+ // '#collapsed' => TRUE,
+ //);
+ //$form['results']['pift_results_display'] = array(
+ // '#type' => 'checkboxes',
+ // '#title' => t('Project types'),
+ // '#description' => t('Project types for which the "Testing Status" tab should be displayed on the project page.'),
+ // '#options' => $project_types,
+ // '#default_value' => variable_get('pift_results_display', array()),
+ //);
$form['criteria'] = array(
'#type' => 'fieldset',
@@ -124,7 +127,7 @@ function pift_admin_settings_form() {
'#type' => 'checkboxes',
'#title' => t('Core branches'),
'#description' => t('Drupal core branches that are to be tested. Issues pertaining to them will have files tested.'),
- '#options' => project_release_compatibility_list(),
+ '#options' => pift_compatibility_list(),
'#default_value' => variable_get('pift_core', array()),
);
// Release must be compatible with Drupal 6 or later in order to be tested.
@@ -200,10 +203,16 @@ function pift_admin_settings_form_validate($form, &$form_state) {
* Query pid using project title.
*/
function pift_admin_settings_form_submit($form, &$form_state) {
- $form_state['values']['pift_pid'] = db_result(
- db_query("SELECT nid
- FROM {node}
- WHERE title = '%s'
- AND type = '%s'", $form_state['values']['pift_pid'], 'project_project')
- );
+ $query = new EntityFieldQuery();
+ $query->entityCondition('entity_type', 'node')
+ ->entityCondition('bundle', project_project_node_types(), 'IN')
+ ->propertyCondition('status', 1)
+ ->propertyCondition('title', $form_state['values']['pift_pid'])
+ ->range(0,1);
+ $result = $query->execute();
+
+ if (isset($result['node'])) {
+ $form_state['values']['pift_pid'] = reset(array_keys($result['node']));
+ }
}
+
diff --git a/pift.cron.inc b/pift.cron.inc
index c3a5e11..715f271 100644
--- a/pift.cron.inc
+++ b/pift.cron.inc
@@ -21,13 +21,14 @@ function pift_cron_retest() {
// Only attempt query if both values are not empty.
if ($api_versions && $sids) {
- $retest_time = time() - PIFT_RETEST;
+ $retest_time = REQUEST_TIME - PIFT_RETEST;
// Loop over 'ON' clause to remove an 'OR' which should be more efficient.
foreach (array('u.nid = pi.nid', 'cu.nid = pi.nid') as $clause) {
+ // TODO: UPDATE THIS QUERY (Upload table doesn't exist anymore)
db_query("UPDATE {pift_test}
- SET status = %d
- WHERE type = %d
+ SET status = :status
+ WHERE type = :type
AND id IN (
SELECT f.fid
FROM {files} f
@@ -45,15 +46,21 @@ function pift_cron_retest() {
JOIN {node} n
ON r.nid = n.nid
- JOIN {term_node} t
- ON (n.vid = t.vid AND t.tid IN (" . db_placeholders($api_versions, 'int') . "))
+ JOIN {taxonomy_term_node} t
+ ON (n.vid = t.vid AND t.tid IN (:api_versions))
- WHERE pi.sid IN (" . db_placeholders($sids, 'int') . ")
+ WHERE pi.sid IN (:sids)
)
- AND status > %d
- AND last_tested < %d",
- array_merge(array(PIFT_STATUS_QUEUE, PIFT_TYPE_FILE), $api_versions, $sids,
- array(PIFT_STATUS_SENT, $retest_time)));
+ AND status > :status2
+ AND last_tested < :last_tested",
+ array(
+ ':status' => PIFT_STATUS_QUEUE,
+ ':type' => PIFT_TYPE_FILE,
+ ':api_versions' => $api_versions,
+ ':sids' => $sids,
+ ':status2' => PIFT_STATUS_SENT,
+ ':last_tested' => $retest_time,
+ ));
}
}
}
@@ -182,50 +189,62 @@ function pift_cron_queue_batch_build() {
* @param array $branches Branches that must be loaded.
*/
function pift_cron_queue_batch_build_files(array &$batch, array &$branches) {
- // Load all files that are marked as needs testing or have never been tested.
- $result = db_query('SELECT f.fid, f.filepath, u.nid AS u_nid, cu.nid AS c_nid, cu.cid AS c_cid
- FROM {pift_test} t
- JOIN {files} f
- ON (t.type = %d AND t.id = f.fid)
- LEFT JOIN {upload} u
- ON f.fid = u.fid
- LEFT JOIN {comment_upload} cu
- ON f.fid = cu.fid
- WHERE t.status = %d
- LIMIT %d', PIFT_TYPE_FILE, PIFT_STATUS_QUEUE, PIFT_XMLRPC_MAX);
- while ($file = db_fetch_array($result)) {
- // Load the issue related to the file, either from the comment or node.
- $issue_nid = !empty($file['u_nid']) ? $file['u_nid'] : $file['c_nid'];
- $item = array(
- 'client_identifier' => $file['fid'],
- 'file_url' => file_create_url($file['filepath']),
- );
+ // Retrieve all file tests which are marked as needs testing.
+ $query = db_select('pift_test', 't', array('fetch' => PDO::FETCH_ASSOC))
+ ->fields('t', array('test_id', 'id'))
+ ->condition('type', 2, '=')
+ ->condition('status', 1, '=')
+ ->orderBy('id', 'DESC');
+ $result = $query->execute();
+ $tests = array();
+ foreach ($result as $record) {
+ $tests[$record['test_id']] = $record['id'];
+ }
+
+ // Retrieve the associated project_issue node for each test.
+ $query = new EntityFieldQuery();
+ $query->entityCondition('entity_type', 'node')
+ ->entityCondition('bundle', project_issue_issue_node_types())
+ ->propertyCondition('status', 1)
+ ->fieldCondition('field_issue_files', 'fid', $tests, 'IN');
+ $result = $query->execute();
+
+ // Load the project_issue entities
+ if (isset($result['node'])) {
+ $issue_nids = array_keys($result['node']);
+ $issues = entity_load('node', $issue_nids);
+ }
- $branch_info_result = db_fetch_array(db_query('SELECT prn.nid AS rid, prn.version_major, prn.tag
- FROM {project_issues} pi, {project_release_nodes} prn
- WHERE pi.nid = %d AND pi.rid = prn.nid', $issue_nid));
+ // Foreach issue, datafill the file test batch array placeholder item
+ foreach ($issues as $issue) {
+ $pid = $issue->field_project[LANGUAGE_NONE][0]['target_id'];
+ $version = $issue->field_issue_version[LANGUAGE_NONE][0]['value'];
+ $rid = project_release_exists($pid, $version);
+ $item['branch_identifier'] = $rid;
- $item['branch_identifier'] = $branch_info_result['rid'];
- // Store branch as needed to be included with data.
- $branches[$branch_info_result['rid']] = FALSE; // Do not test unless commit found.
+ // Store the branch as required for the file test to the 'branches' array.
+ // We mark the value 'FALSE' to indicate that we do not need to test this
+ // branch, unless a commit is found on that branch later in processing.
+ $branches[$rid] = FALSE;
- // Get any dependent branches and add them to the $branches array
- $branch_dependencies = project_dependency_get_dependencies($branch_info_result['rid'], PROJECT_DEPENDENCY_DEPENDENCY_REQUIRED);
+ // Add any additional branches which this branch is dependent on
+ $branch_dependencies = project_dependency_get_dependencies($rid, PROJECT_DEPENDENCY_DEPENDENCY_REQUIRED);
foreach ($branch_dependencies as $dep) {
$branches[$dep['release_nid']] = FALSE;
}
- // Generate link to file issue and comment if relevant.
- if ($file['c_cid']) {
- $item['link'] = url('node/' . $issue_nid, array('absolute' => TRUE, 'fragment' => 'comment-' . $file['c_cid']));
- }
- else {
- $item['link'] = url('node/' . $issue_nid, array('absolute' => TRUE));
+ // Add each relevant file on this issue to the batch
+ foreach ($issue->field_issue_files[LANGUAGE_NONE] as $file) {
+ if (in_array($file['fid'], $tests)) {
+ // Finish datafilling the placeholder item.
+ $item['client_identifier'] = $file['fid'];
+ $item['file_url'] = file_create_url($file['uri']);
+ $item['link'] = url('node/' . $issue->nid, array('absolute' => TRUE));
+ // Add the placeholder item to the batch.
+ $batch['files'][] = $item;
+ }
}
-
- // Add file to batch.
- $batch['files'][] = $item;
}
}
@@ -235,13 +254,20 @@ function pift_cron_queue_batch_build_files(array &$batch, array &$branches) {
* @param array $branches Branches that must be loaded.
*/
function pift_cron_queue_batch_build_branches(array &$branches) {
- // Load the branches that are marked as needs testing or have never been tested.
- $result = db_query('SELECT t.id AS rid
- FROM {pift_test} t
- WHERE t.type = %d
- AND t.status = %d
- LIMIT %d', PIFT_TYPE_RELEASE, PIFT_STATUS_QUEUE, PIFT_XMLRPC_MAX);
- while ($branch = db_fetch_array($result)) {
+ // Load branches that are marked as needs testing or have never been tested.
+ $result = db_query(
+ 'SELECT t.id AS rid
+ FROM {pift_test} t
+ WHERE t.type = :type AND t.status = :status
+ LIMIT :limit',
+ array(
+ ':type' => PIFT_TYPE_RELEASE,
+ ':status' => PIFT_STATUS_QUEUE,
+ ':limit' => PIFT_XMLRPC_MAX
+ ),
+ array('fetch' => PDO::FETCH_ASSOC)
+ );
+ foreach ($result as $branch) {
$branches[$branch['rid']] = TRUE;
}
}
@@ -269,29 +295,25 @@ function pift_cron_queue_batch_build_branches_process(array &$batch, array &$bra
// Generate branch information.
$item = array(
- 'project_identifier' => $branch->project_release['pid'],
+ 'project_identifier' => $branch->field_release_project[LANGUAGE_NONE][0]['target_id'],
'client_identifier' => $branch->nid,
- 'vcs_identifier' => $branch->project_release['tag'],
+ 'vcs_identifier' => $branch->field_release_vcs_label[LANGUAGE_NONE][0]['value'],
'dependency' => '',
'plugin_argument' => array(),
'test' => $test,
'link' => url('node/' . $branch->nid, array('absolute' => TRUE)),
);
- // Attempt to determine the Drupal core API version.
+ // Determine the Drupal core API version.
$api = array();
- foreach ($branch->taxonomy as $tid => $term) {
- if (in_array($tid, $api_versions)) {
- $api['version'] = array_shift(explode('.', $term->name, 2));
- $api['tid'] = $term->tid;
- break;
- }
+ $term = taxonomy_term_load(project_release_get_release_api_tid($branch));
+ if (in_array($term->tid, $api_versions)) {
+ $api['version'] = array_shift(exploide('.', $term->name, 2));
+ $api['tid'] = $term->tid;
}
-
// If the API version not found then ignore this branch.
- if (empty($api)) {
+ else {
watchdog('pift', 'Project release node [@nid] does not have a Drupal core API taxonomy term.', array('@nid' => $branch->nid), WATCHDOG_ERROR);
- continue;
}
// If the project is Drupal core then add the plugin argument, otherwise
@@ -380,14 +402,16 @@ function pift_cron_queue_batch_build_projects(array &$batch, array $projects) {
* @return array Release NIDs that match.
*/
function pift_cron_get_release($pid, $tags) {
- $result = db_query('SELECT nid
- FROM {project_release_nodes}
- WHERE pid = %d
- AND tag IN (' . db_placeholders($tags, 'varchar') . ')',
- array_merge(array($pid), $tags));
+ $query = new EntityFieldQuery();
+ $query->entityCondition('entity_type', 'node')
+ ->entityCondition('bundle', 'project_release')
+ ->propertyCondition('status', 1)
+ ->fieldCondition('field_release_project', 'target_id', $pid, '=')
+ ->fieldCondition('field_release_vcs_label', 'value', $tags, 'IN');
+ $result = $query->execute();
$rids = array();
- while ($rid = db_result($result)) {
- $rids[] = $rid;
+ if (isset($result['node'])) {
+ $rids = array_keys($result['node']);
}
return $rids;
}
@@ -413,12 +437,14 @@ function pift_cron_retrieve_results() {
}
elseif (isset($response['results'])) {
foreach ($response['results'] as $result) {
- db_query("UPDATE {pift_test}
- SET status = %d,
- message = '%s',
- last_tested = %d
- WHERE test_id = %d",
- $result['pass'] ? PIFT_STATUS_PASS : PIFT_STATUS_FAIL, $result['message'], time(), $result['test_id']);
+ db_update('pift_test')
+ ->fields(array(
+ 'status' => $result['pass'] ? PIFT_STATUS_PASS : PIFT_STATUS_FAIL,
+ 'message' => $result['message'],
+ 'last_tested' => REQUEST_TIME,
+ ))
+ ->condition('test_id', $result['test_id'])
+ ->execute();
pift_cron_check_auto_followup($result);
}
@@ -447,29 +473,19 @@ function pift_cron_check_auto_followup(array $result) {
$test = pift_test_get($result['test_id']);
if ($test['fid']) {
// Get the current issue state and ensure that the test is the last one
- // for the particular issue. Cycle through clauses to remove the need for
- // an OR clause and thus improve performance.
+ // for the particular issue.
$results = array();
- foreach (array('u.nid = i.nid', 'cu.nid = i.nid') as $clause) {
- $result = db_query('SELECT t.test_id, t.id
- FROM {pift_test} t
- LEFT JOIN {upload} u
- ON (t.type = %d AND t.id = u.fid)
- LEFT JOIN {comment_upload} cu
- ON (t.type = %d AND t.id = cu.fid)
- JOIN {project_issues} i
- ON ' . $clause . '
- WHERE u.nid = %d OR cu.nid = %d
- ORDER BY t.id DESC
- LIMIT 1', PIFT_TYPE_FILE, PIFT_TYPE_FILE, $test['nid'], $test['nid']);
- $results[] = db_fetch_array($result);
- }
-
- // To simulate OR clause and descending order by 'id' select the test_id
- // that has the highest 'id' value.
- $test_id = $results[0]['id'] > $results[1]['id'] ? $results[0]['test_id'] : $results[1]['test_id'];
-
- if ($test_id == $test['test_id'] && pift_test_check_criteria_issue(node_load($test['nid']))) {
+ $query = db_select('pift_test', 't', array('fetch' => PDO::FETCH_ASSOC))
+ ->fields('t', array('test_id', 'id'))
+ ->condition('t.type', PIFT_TYPE_FILE, '=');
+ $query->leftJoin('field_data_field_issue_files', 'fd', 't.id = fd.field_issue_files_fid');
+ $query->join('project_issues', 'i', 'fd.entity_id = i.nid');
+ $query->condition('fd.entity_id', $test['nid'], '=');
+ $query->orderBy('t.id', 'DESC')
+ ->range(0,1);
+ $result = $query->execute()->fetchField();
+
+ if ($result == $test['test_id'] && pift_test_check_criteria_issue(node_load($test['nid']))) {
// Test is last one for the particular issue and still fits the criteria.
pift_cron_auto_followup($test['nid'], $test['cid'], $test['filename']);
}
@@ -485,11 +501,11 @@ function pift_cron_check_auto_followup(array $result) {
* @param string $filename Name of file.
*/
function pift_cron_auto_followup($nid, $cid, $filename) {
- project_issue_add_auto_followup(array(
- 'nid' => $nid,
- 'sid' => PIFT_FOLLOWUP_FAIL,
- 'comment' => theme('pift_auto_followup', 'fail', $nid, $cid, $filename),
- ));
+ $node = node_load($nid);
+ $node->field_issue_status['value'] = PIFT_FOLLOWUP_FAIL;
+ $node->nodechanges_uid = variable_get('project_issue_followup_user', drupal_anonymous_user()->uid);
+ $node->nodechanges_comment_body['value'] = theme('pift_auto_followup', array('type' => 'fail', 'nid' => $nid, 'cid' => $cid, 'filename' => $filename));
+ node_save($node);
}
/**
diff --git a/pift.css b/pift.css
index ee780db..3ec785c 100644
--- a/pift.css
+++ b/pift.css
@@ -1,14 +1,12 @@
-tr.pift-pass,
-tr.pift-pass td {
+
+tr.pift-pass {
background-color: #99FF99 !important;
}
-tr.pift-fail,
-tr.pift-fail td {
+tr.pift-fail {
background-color: #FF9999 !important;
}
-tr.pift-retest,
-tr.pift-retest td {
+tr.pift-retest {
background-color: #FFFF77 !important;
}
diff --git a/pift.info b/pift.info
index f2adfbe..78ee8e1 100644
--- a/pift.info
+++ b/pift.info
@@ -1,13 +1,7 @@
name = PIFT
description = Integrates into project to provide an automated testing hub.
package = Project
-core = 6.x
-php = 5
-files[] = pift.admin.inc
-files[] = pift.module
-files[] = pift.pages.inc
-files[] = pift.project.inc
-files[] = pift.test.inc
+core = 7.x
dependencies[] = project
dependencies[] = project_dependency
dependencies[] = project_issue
diff --git a/pift.install b/pift.install
index 330ff1b..53dd36f 100644
--- a/pift.install
+++ b/pift.install
@@ -8,44 +8,44 @@
*/
/**
- * Implementation of hook_schema().
+ * Implements hook_schema().
*/
function pift_schema() {
$schema['pift_test'] = array(
- 'description' => t('Stores test results.'),
+ 'description' => 'Stores test results.',
'fields' => array(
'test_id' => array(
- 'description' => t('Unique test ID.'),
+ 'description' => 'Unique test ID.',
'type' => 'int',
'unsigned' => TRUE,
'not null' => FALSE,
),
'type' => array(
- 'description' => t('Type of test, PIFT_TYPE_*.'),
+ 'description' => 'Type of test, PIFT_TYPE_*.',
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
),
'id' => array(
- 'description' => t('Related test detail record ID, either rid, or fid.'),
+ 'description' => 'Related test detail record ID, either rid, or fid.',
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
),
'status' => array(
- 'description' => t('Status of the test, PIFT_STATUS_*.'),
+ 'description' => 'Status of the test, PIFT_STATUS_*.',
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
),
'message' => array(
- 'description' => t('Summary message of test result.'),
+ 'description' => 'Summary message of test result.',
'type' => 'text',
'size' => 'big',
'not null' => FALSE,
),
'last_tested' => array(
- 'description' => t('Timestamp when test results were last recieved.'),
+ 'description' => 'Timestamp when test results were last recieved.',
'type' => 'int',
'not null' => TRUE,
'default' => 0,
@@ -59,10 +59,10 @@ function pift_schema() {
),
);
$schema['pift_project'] = array(
- 'description' => t('Store project testing preference.'),
+ 'description' => 'Store project testing preference.',
'fields' => array(
'pid' => array(
- 'description' => t('Reference to project NID.'),
+ 'description' => 'Reference to project NID.',
'type' => 'serial',
'unsigned' => TRUE,
'not null' => TRUE,
@@ -75,43 +75,22 @@ function pift_schema() {
}
/**
- * Implementation of hook_install().
+ * Implements hook_install().
*/
function pift_install() {
- // Create tables.
- drupal_install_schema('pift');
-
// Ensure that pift runs after comment_upload.
- db_query("UPDATE {system}
- SET weight = 3
- WHERE name = '%s'", 'pift');
-
- // Check for pift_data and as such an update.
- if (db_table_exists('pift_data')) {
- // Set schema version just before first update to ensure that updates are
- // triggered even though the module has been renamed.
- register_shutdown_function('pift_install_force_update');
- }
+ db_update('system')
+ ->fields(array(
+ 'weight' => 3,
+ ))
+ ->condition('name', 'pift')
+ ->execute();
}
/**
- * Force update by reverting schema.
- *
- * The schema must be reverted after hook_install() has finished.
- */
-function pift_install_force_update() {
- db_query("UPDATE {system}
- SET schema_version = 6199
- WHERE name = '%s'", 'pift');
-}
-
-/**
- * Implementation of hook_uninstall().
+ * Implements hook_uninstall().
*/
function pift_uninstall() {
- // Remove tables.
- drupal_uninstall_schema('pift');
-
$vars = array(
'pift_frequency',
'pift_last',
@@ -133,186 +112,3 @@ function pift_uninstall() {
variable_del($var);
}
}
-
-/**
- * Remove old variables an setup drupal.org defaults.
- */
-function pift_update_6200() {
- $ret = array();
-
- // List of old variables.
- $vars = array(
- 'pift_server_sites',
- 'pift_server_send_frequency',
- 'pift_server_last_sent',
- 'pift_next_test_server',
- 'pift_server_file_description',
- 'pift_send_limit',
- 'pift_batch_size',
- 'pift_file_regex',
- 'pift_resend_time',
- 'pift_retest_time',
- 'pift_test_status',
- 'pift_projects',
- 'pift_server_release_tag_regex',
- 'pift_server_debug_file_testing_link',
- 'pift_server_auto_followup_sid',
- );
-
- // Remove old variables.
- foreach ($vars as $var) {
- variable_del($var);
- }
-
- // List of default drupal.org values.
- $vars = array(
- 'pift_frequency' => 0, // Per cron run.
- 'pift_server' => 'http://testing.drupal.org/',
- 'pift_description' => 'Only files ending in .patch or .diff will be sent for testing. '.
- 'For patches that apply specifically to Drupal 5 or Drupal 6, you can prefix the extension ' .
- 'with -D5 or -D6 to prevent them from being queued for testing. For example, ' .
- 'foo.patch and bar.diff would both be queued for testing, whereas ' .
- 'foo-D5.patch and bar-D6.diff would not be queued for testing.',
- 'pift_followup_fail' => 13, // Status: 'Needs work'.
- 'pift_followup_retest' => 8, // Status: 'Needs review'.
- 'pift_regex' => '/(? array(8, 14), // Statuses: 'Needs review', 'reviewed & tested by the community'.
- 'pift_core' => array(7 => 7),
- 'pift_pid' => 3060, // Drupal core project NID.
- 'pift_retest' => 86400, // 1 day.
- );
-
- // Store each default variable value.
- foreach ($vars as $key => $value) {
- variable_set($key, $value);
- }
-
- // Enable testing for the drupal project.
- db_query('INSERT INTO {pift_project} (pid)
- VALUES (%d)', 3060);
-
- return $ret;
-}
-
-/**
- * Update test records.
- */
-function pift_update_6201(&$sandbox = NULL) {
- $ret = array();
-
- if (!isset($sandbox['progress'])) {
- $sandbox['progress'] = 0;
- $sandbox['current_ftid'] = 0;
- $sandbox['max'] = db_result(db_query('SELECT COUNT(ftid) FROM {pift_data}'));
- }
-
- // Map of old status to equivilent new ones.
- $statuses = array(
- 0 => 1, // PIFT_UNTESTED => PIFT_STATUS_QUEUE
- 1 => 4, // PIFT_PASSED => PIFT_STATUS_PASS
- 2 => 3, // PIFT_FAILED => PIFT_STATUS_FAIL
- 3 => 1, // PIFT_RETEST => PIFT_STATUS_QUEUE
- 4 => 1, // PIFT_NOT_READABLE => PIFT_STATUS_QUEUE
- );
-
- // Read in map of ftid => test_id provided from pifr server 1.x, in a comma
- // delimited file of the format: file_id(test_id),ftid.
- if ($lines = file(drupal_get_path('module', 'pift') . '/pifr.file.map')) {
- $map = array();
- foreach ($lines as $line) {
- $parts = explode(',', $line);
- $map[trim($parts[1])] = trim($parts[0]);
- }
-
- // Update old data and insert into test table.
- $result = db_query_range('SELECT *
- FROM {pift_data}
- WHERE ftid > %d
- ORDER BY ftid ASC', $sandbox['current_ftid'], 0, 5000);
- while ($test = db_fetch_object($result)) {
- // Only covert data that testing.drupal.org has a record of.
- if (isset($map[$test->ftid])) {
- // Remove link from display data.
- $message = preg_replace('/\s+(display_data);
-
- db_query("INSERT INTO {pift_test} (test_id, type, id, status, message, last_tested)
- VALUES (%d, %d, %d, %d, '%s', %d)",
- $map[$test->ftid], PIFT_TYPE_FILE, $test->fid, $statuses[$test->status], $message, $test->timestamp);
- }
- $sandbox['progress']++;
- $sandbox['current_ftid'] = $test->ftid;
- }
-
- $ret['#finished'] = empty($sandbox['max']) ? 1 : ($sandbox['progress'] / $sandbox['max']);
- }
-
- return $ret;
-}
-
-/**
- * Remove old data.
- */
-function pift_update_6202() {
- $ret = array();
-
- $ret[] = update_sql('DROP TABLE {pift_data}');
-
- return $ret;
-}
-
-/**
- * Convert the core API versions variable to term IDs and enable 6.x and 7.x.
- */
-function pift_update_6203() {
- variable_set('pift_core', array(87 => 87, 103 => 103));
-
- return array();
-}
-
-/**
- * Set the 'pift_last_retrieve' to a close approximate of what it should be.
- */
-function pift_update_6204() {
- function pifr_server_xmlrpc_time_gmt($timestamp) {
- $now = time();
- $offset = $now - $timestamp;
- return gmmktime() - $offset;
- }
-
- $last = db_result(db_query('SELECT MAX(last_tested) FROM {pift_test}'));
- $last = pifr_server_xmlrpc_time_gmt($last ? $last : 1);
- variable_set('pift_last_retrieve', $last);
-
- return array();
-}
-
-/**
- * Remove variable 'pift_last_cid'.
- */
-function pift_update_6205() {
- variable_del('pift_last_cid');
- return array();
-}
-
-/**
- * Change schema to reflect that pift_test.test_id and message can be null.
- */
-function pift_update_6206() {
- $ret = array();
- $newattr = array(
- 'description' => t('Unique test ID.'),
- 'type' => 'int',
- 'unsigned' => TRUE,
- 'not null' => FALSE,
- );
- db_change_field($ret, 'pift_test', 'test_id', 'test_id', $newattr);
-
- $newattr = array(
- 'description' => t('Summary message of test result.'),
- 'type' => 'text',
- 'size' => 'big',
- 'not null' => FALSE,
- );
- db_change_field($ret, 'pift_test', 'message', 'message', $newattr);
- return $ret;
-}
\ No newline at end of file
diff --git a/pift.module b/pift.module
index f35b266..fd9287e 100644
--- a/pift.module
+++ b/pift.module
@@ -18,7 +18,7 @@ define('PIFT_DESCRIPTION', variable_get('pift_description', ''));
define('PIFT_FOLLOWUP_FAIL', variable_get('pift_followup_fail', 0));
define('PIFT_FOLLOWUP_RETEST', variable_get('pift_followup_retest', 0));
define('PIFT_REGEX', variable_get('pift_regex', '/(\.diff|\.patch)$/'));
-define('PIFT_PID', variable_get('pift_pid', -1));
+define('PIFT_PID', variable_get('pift_pid', 3060)); // TODO: Drupal.org specific, to expediate the D7 port
define('PIFT_RETEST', variable_get('pift_retest', 24 * 60 * 60));
define('PIFT_DELETE', variable_get('pift_delete', FALSE));
define('PIFT_LAST_RETRIEVE', variable_get('pift_last_retrieve', 1));
@@ -70,7 +70,7 @@ module_load_include('project.inc', 'pift');
module_load_include('test.inc', 'pift');
/**
- * Implementation of hook_menu().
+ * Implements hook_menu().
*/
function pift_menu() {
$items = array();
@@ -99,17 +99,21 @@ function pift_menu() {
'file' => 'pift.pages.inc',
'type' => MENU_CALLBACK,
);
- $items['node/%node/testing-status'] = array(
+
+// TODO: The plan was to remove the testing-status tab for the D7 Port, and
+// add it back in with Conduit. However, we need somewhere to store the
+// 'enable testing' checkbox, so leaving this in temporarily until the Conduit
+// piece is available.
+ $items['node/%node/qa-settings'] = array(
'title' => t('Automated Testing'),
'access callback' => 'pift_results_visibility',
'access arguments' => array(1),
- 'page callback' => 'pift_results_project_tab',
- 'page arguments' => array(1),
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('pift_pages_project_issue_settings', 1),
'file' => 'pift.results.inc',
'weight' => '5',
'type' => MENU_LOCAL_TASK,
);
-
return $items;
}
@@ -117,50 +121,52 @@ function pift_menu() {
* Access callback to determine whether the Automated Testing tab is visible.
*/
function pift_results_visibility($node) {
- // Check if we have a module node which has a Git repository
- // Do not display the tab if the project does not have any release nodes
- // TODO: Once PIFT/PIFR has been refactored to use label_ids instead of
- // release nids, the last condition can be changed to enable reporting
- // of tests for any tag/branch within a project.
-
- // Determine if node represents a valid project type for results display
- $valid_type = array_intersect(variable_get('pift_results_display', array()), array_keys($node->taxonomy));
- if ($node->type == 'project_project'
- && !empty($valid_type)
- && !empty($node->versioncontrol_project['repo']->vcs)
- && $node->versioncontrol_project['repo']->vcs == 'git'
- && user_access('pift access project testing tab')
- && pift_get_releases($node, TRUE) != array()) {
- return TRUE;
+ // Only display the tab on projects with releases
+ if (project_node_is_project($node)) {
+ if ($node->field_project_has_releases[$node->language][0]['value']) {
+ // Ensure user has access to enable testing on the node
+ if (user_access('pift enable project testing')) {
+ return TRUE;
+ }
+ }
}
return FALSE;
}
/**
- * Implementation of hook_perm().
+ * Implements hook_permission().
*/
-function pift_perm() {
+function pift_permission() {
return array(
- 'pift re-test files',
- 'pift enable project testing',
- 'pift access project testing tab'
+ 'pift re-test files' => array(
+ 'title' => t('pift re-test files'),
+ 'description' => t('Request a file to be re-tested'),
+ ),
+ 'pift enable project testing' => array(
+ 'title' => t('pift enable project testing'),
+ 'description' => t('Enable testing on a project'),
+ ),
+ 'pift access project testing tab' => array(
+ 'title' => t('pift access project testing tab'),
+ 'description' => t('Access the testing tab on projects'),
+ ),
);
}
/**
- * Implementation of hook_theme().
+ * Implements hook_theme().
*/
function pift_theme() {
return array(
'pift_attachments' => array(
- 'arguments' => array(
+ 'variables' => array(
'files' => array(),
'closed' => FALSE,
),
'file' => 'pift.pages.inc',
),
'pift_auto_followup' => array(
- 'arguments' => array(
+ 'variables' => array(
'type' => '',
'nid' => 0,
'cid' => 0,
@@ -171,14 +177,14 @@ function pift_theme() {
}
/**
- * Implementation of hook_init().
+ * Implements hook_init().
*/
function pift_init() {
drupal_add_css(drupal_get_path('module', 'pift') . '/pift.css');
}
/**
- * Implementation of hook_cron().
+ * Implements hook_cron().
*/
function pift_cron() {
if (PIFT_DELETE) {
@@ -188,7 +194,7 @@ function pift_cron() {
}
// Check if sending is enabled and that the sending frequency has elapsed.
- $time = time();
+ $time = REQUEST_TIME;
if (PIFT_FREQUENCY != -1 && $time > PIFT_LAST + PIFT_FREQUENCY) {
module_load_include('cron.inc', 'pift');
@@ -207,46 +213,7 @@ function pift_cron() {
}
/**
- * Implementation of hook_versioncontrol_git_refs_updated().
- */
-function pift_versioncontrol_git_refs_updated($repository, $refs) {
- // Ignore commits for disabled projects.
- if (!pift_project_enabled($repository->project_nid)) {
- return;
- }
-
- module_load_include('cron.inc', 'pift');
-
- // @TODO Decide if we want to and how to handle with tags.
- $api_versions = pift_core_api_versions();
- $rids = pift_cron_get_release($repository->project_nid, array_keys($refs['branches']));
- foreach ($rids as $rid) {
- // Ensure that one of the compatibility terms is present on the release node.
- $release = node_load($rid);
- $found = FALSE;
- foreach ($api_versions as $api_version) {
- if (array_key_exists($api_version, $release->taxonomy)) {
- // Compatible term found, continue processing.
- $test_id = db_result(db_query('SELECT test_id
- FROM {pift_test}
- WHERE type = %d
- AND id = %d', PIFT_TYPE_RELEASE, $rid));
-
- // If existing test for release, queue it, otherwise add a new test.
- if ($test_id) {
- pift_test_requeue($test_id);
- }
- else if ($test_id !== 0) {
- pift_test_add(PIFT_TYPE_RELEASE, $rid);
- }
- break;
- }
- }
- }
-}
-
-/**
- * Implementation of hook_versioncontrol_code_arrival().
+ * Implements hook_versioncontrol_code_arrival().
*/
function pift_versioncontrol_code_arrival(VersioncontrolRepository $repository, VersioncontrolEvent $event) {
// Ignore events for disabled projects and non-Git repos.
@@ -272,10 +239,10 @@ function pift_versioncontrol_code_arrival(VersioncontrolRepository $repository,
foreach ($api_versions as $api_version) {
if (array_key_exists($api_version, $release->taxonomy)) {
// Compatible term found, continue processing.
- $test_id = db_result(db_query('SELECT test_id
+ $test_id = db_query('SELECT test_id
FROM {pift_test}
- WHERE type = %d
- AND id = %d', PIFT_TYPE_RELEASE, $rid));
+ WHERE type = :type
+ AND id = :id', array(':type' => PIFT_TYPE_RELEASE, ':id' => $rid))->fetchField();
// If existing test for release, queue it, otherwise add a new test.
if ($test_id) {
@@ -301,11 +268,11 @@ function pift_get_releases($node, $quiet = FALSE) {
$valid = pift_valid_prefix_list();
$branches = array();
$topbranches = array();
- if ($node->type == 'project_project') {
+ if (project_node_is_project($node)) {
$result = db_query("Select b.name from {versioncontrol_release_labels} a
join {versioncontrol_labels} b on a.label_id = b.label_id
- where a.project_nid = %s", $node->nid);
- while ($data = db_fetch_object($result)) {
+ where a.project_nid = :nid", array(':nid' => $node->nid));
+ foreach ($result as $data) {
// Filter out any branches < 6 (not accepted by PIFT)
// Move '.x' releases to the top
if (in_array(substr($data->name, 0, 3), $valid)) {
@@ -338,7 +305,7 @@ function pift_valid_prefix_list() {
$tids = variable_get('pift_core', array());
foreach ($tids as $key => $value) {
if (!empty($tids[$key])) {
- $term = taxonomy_get_term($key);
+ $term = taxonomy_term_load($key);
$terms[$key] = $term->name;
}
}
@@ -360,155 +327,190 @@ function pift_array_reverse($array) {
$array_return = array();
for ($i = 1, $size_of_array = sizeof($array_key); $i <= $size_of_array; $i++) {
- $array_return[$array_key[$size_of_array-$i]] = $array_value[$size_of_array-$i];
+ $array_return[$array_key[$size_of_array -$i]] = $array_value[$size_of_array -$i];
}
return $array_return;
}
/**
- * Implementation of hook_form_alter(). Must use generic form_alter() due to
- * comment_upload implementation.
+ * Implements hook_form_FORM_ID_alter().
*/
-function pift_form_alter(&$form, $form_state, $form_id) {
- if ($form_id == 'comment_form' || $form_id == 'project_issue_node_form') {
+function pift_form_project_issue_node_form_alter(&$form, $form_state, $form_id) {
module_load_include('pages.inc', 'pift');
pift_pages_description_add($form, $form_state, $form_id);
- }
}
/**
- * Implementation of hook_form_alter(): project_issue_project_edit_form.
+ * Implements hook_node_view().
+ *
+ * TODO: This approach is no longer valid after the project* changes. The
+ * new approach will be to implement a field formatter on the field_issue_files
+ * field, and add the pift testing results via this field formatter; which
+ * should be much cleaner than removing and injecting the file attachments
+ * table as was done in D6.
*/
-function pift_form_project_issue_project_edit_form_alter(&$form, $form_state) {
- module_load_include('pages.inc', 'pift');
- pift_pages_project_issue_settings($form, $form_state);
-}
+//function pift_node_view($node, $view_mode = 'full') {
+// if (pift_node_is_interesting($node)) {
+// if (!$a3 && pift_project_enabled($node->project_issue['pid'])) { // Full view.
+// $files = pift_test_get_files_node($node->nid);
+// $status = $node->project_issue['sid'];
+// $node->content['pift_files'] = array(
+// '#value' => '' .
+// theme('pift_attachments', array('files' => $files, 'closed' => $status)) . '
',
+// '#weight' => 50,
+// );
+// unset($node->content['files']); // Remove old attachments table.
+// }
+// }
+//}
/**
- * Implementation of hook_nodeapi().
- */
-function pift_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
- if ($node->type == 'project_project') {
- // Used to maintain 'nice' url aliases for testing status pages
- $src = 'node/' . $node->nid . '/testing-status';
- if ($op == 'delete') {
- db_query("DELETE FROM {url_alias} WHERE src = '%s'", $src);
- }
- elseif (($op == 'update' || $op == 'insert') && !empty($node->project['uri'])) {
- $dst = 'project/' . drupal_urlencode($node->project['uri']) . '/testing-status';
- db_query("DELETE FROM {url_alias} WHERE src = '%s'", $src);
- db_query("INSERT INTO {url_alias} (src, dst) VALUES ('%s', '%s')", $src, $dst);
+ * Implements hook_node_insert().
+ */
+function pift_node_insert($node) {
+ if (pift_node_is_interesting($node)) {
+ if (!empty($node->field_issue_files)) {
+ if (pift_test_check_criteria_issue($node)) {
+ pift_test_add_files($node->field_issue_files);
+ }
}
}
- elseif ($node->type != 'project_issue' || empty($node->files)) {
- return;
- }
+}
- switch ($op) {
- case 'view':
- if (!$a3 && pift_project_enabled($node->project_issue['pid'])) { // Full view.
- $files = pift_test_get_files_node($node->nid);
- $status = $node->project_issue['sid'];
- $node->content['pift_files'] = array(
- '#value' => '' .
- theme('pift_attachments', $files, $status) . '
',
- '#weight' => 50,
- );
- unset($node->content['files']); // Remove old attachments table.
- }
- break;
- case 'insert':
- $proper = pift_nodeapi_clean($node);
- if (pift_test_check_criteria_issue($proper)) {
- $files = upload_load($proper);
- pift_test_add_files($files);
+/**
+ * Implements hook_node_update().
+ */
+function pift_node_update($node) {
+ if (pift_node_is_interesting($node)) {
+ if ($node->field_issue_files != $node->original->field_issue_files) {
+ if (!empty($node->field_issue_files)) {
+ if (pift_test_check_criteria_issue($node)) {
+ pift_test_add_files($node->field_issue_files);
+ }
}
- break;
- case 'delete':
- variable_set('pift_delete', TRUE);
- break;
+ }
}
}
/**
+ * Implements hook_node_delete().
+ */
+function pift_node_delete($node) {
+ if (pift_node_is_interesting($node)) {
+ // Flag pift that a project or issue node was deleted.
+ if (project_node_is_project($node)) {
+ // Remove this project from the pift_project table
+ db_delete('pift_project')->condition('nid', $node->nid)->execute();
+ }
+ variable_set('pift_delete', TRUE);
+ }
+}
+
+/**
+ * Check if a node is a project node or issue node with file attached.
+ *
+ * Used in hook_node_*() to filter out irrelevant nodes.
+ */
+function pift_node_is_interesting($node) {
+ return project_node_is_project($node) || (project_issue_node_is_issue($node) && !empty($node->field_issue_files));
+}
+
+/**
* Cleanup the inconsistent project_issue property placement.
*
+ * TODO: Confirm this approach is no longer valid after the project* changes.
+ *
* In order to remove the need to a bunch of conditions all over PIFT, convert
* the inconsistent node format to the one used everywhere else. The
* inconsistent format is only found during node creation, after a node has
* been created and hook_load() is used the properties are prefixed by
* project_issue.
*
+ *
+ *
* @param object $node Node to convert.
* @return object Properly formatted node.
* @link http://drupal.org/node/519562
*/
-function pift_nodeapi_clean($node) {
- $node->project_issue = array();
-
- $fields = array('pid', 'rid', 'component', 'category', 'priority', 'assigned', 'sid');
- foreach ($fields as $field) {
- $node->project_issue[$field] = $node->$field;
- }
-
- return $node;
-}
+//function pift_nodeapi_clean($node) {
+// $node->project_issue = array();
+//
+// $fields = array('pid', 'rid', 'component', 'category', 'priority', 'assigned', 'sid');
+// foreach ($fields as $field) {
+// $node->project_issue[$field] = $node->$field;
+// }
+//
+// return $node;
+//}
/**
- * Implementation of hook_comment().
+ * Implements hook_comment_view().
+ *
+ * TODO: This approach is no longer valid after the project* changes. The
+ * new approach will be to implement a field formatter on the field_issue_files
+ * field and comments, and add the pift testing results via this field
+ * formatter; which should be much cleaner than removing and injecting the file
+ * attachments table as was done in D6.
*/
-function pift_comment(&$comment, $op) {
- $node = pift_comment_load_node($comment);
- if ($node->type != 'project_issue') {
- return;
- }
+//function pift_comment_view($comment) {
+// if ($node = pift_comment_is_interesting($comment)) {
+// if (!empty($comment->files) && pift_project_enabled($node->project_issue['pid'])) {
+// // Remove comment_upload attachments table and generate new one.
+// $comment->comment = preg_replace('/