diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-10-04 14:51:16 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-10-04 14:51:16 +0000 |
| commit | a1cbd755458534fb2baf161307ca964ff17f22ca (patch) | |
| tree | 812f777498b0966e413e91f76200dfd53d07081b /modules/simpletest | |
| parent | 522c052fadabe6685e7292b7001966c2eedf5975 (diff) | |
| download | brdo-a1cbd755458534fb2baf161307ca964ff17f22ca.tar.gz brdo-a1cbd755458534fb2baf161307ca964ff17f22ca.tar.bz2 | |
#930708 by catch, dww: Fixed taxonomy_update_7005() can go on an infinite search.
Diffstat (limited to 'modules/simpletest')
| -rw-r--r-- | modules/simpletest/tests/upgrade/drupal-6.filled.database.php | 5 | ||||
| -rw-r--r-- | modules/simpletest/tests/upgrade/upgrade.taxonomy.test | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/modules/simpletest/tests/upgrade/drupal-6.filled.database.php b/modules/simpletest/tests/upgrade/drupal-6.filled.database.php index 2bd4a54e9..9f33ee0a7 100644 --- a/modules/simpletest/tests/upgrade/drupal-6.filled.database.php +++ b/modules/simpletest/tests/upgrade/drupal-6.filled.database.php @@ -13268,6 +13268,11 @@ db_insert('term_node')->fields(array( ->values(array( 'nid' => '1', 'vid' => '1', + 'tid' => '0', +)) +->values(array( + 'nid' => '1', + 'vid' => '1', 'tid' => '1', )) ->values(array( diff --git a/modules/simpletest/tests/upgrade/upgrade.taxonomy.test b/modules/simpletest/tests/upgrade/upgrade.taxonomy.test index 72be9ef8a..d4c47f8de 100644 --- a/modules/simpletest/tests/upgrade/upgrade.taxonomy.test +++ b/modules/simpletest/tests/upgrade/upgrade.taxonomy.test @@ -117,6 +117,13 @@ class UpgradePathTaxonomyTestCase extends UpgradePathTestCase { } } + // nid 1, revision 1 had a bogus record in {term_node} pointing to term + // ID 0. Make sure we ignored this instead of generating a bogus term. + if ($node->nid == 1) { + $link = l($term->name, 'taxonomy/term/0'); + $this->assertNoRaw($link, t('Bogus term (tid 0) is not displayed on node 1 vid %old_vid.', $args)); + } + // The first 12 nodes have two revisions. For nodes with // revisions, check that the oldest revision is associated only // to terms whose ID is equal to the node ID or 49 less the node ID. |