- Patch #623992 by sun: fixed the tests. We can re-enable the test bot now.

3 files changed, 5 insertions, 5 deletions

diff --git a/modules/field/field.test b/modules/field/field.test
index b85c4c594..49c0f30ba 100644
--- a/modules/field/field.test
+++ b/modules/field/field.test
@@ -1432,7 +1432,7 @@ class FieldFormTestCase extends FieldTestCase {
     // Submit with missing required value.
     $edit = array();
     $this->drupalPost('test-entity/add/test-bundle', $edit, t('Save'));
-    $this->assertRaw(t('!name field is required.', array('!name' => $this->instance['label'])), 'Required field with no value fails validation');
+    $this->assertText(t('!name field is required.', array('!name' => $this->instance['label'])), 'Required field with no value fails validation');
 
     // Create an entity
     $value = mt_rand(1, 127);
@@ -1448,7 +1448,7 @@ class FieldFormTestCase extends FieldTestCase {
     $value = '';
     $edit = array("{$this->field_name}[$langcode][0][value]" => $value);
     $this->drupalPost('test-entity/' . $id . '/edit', $edit, t('Save'));
-    $this->assertRaw(t('!name field is required.', array('!name' => $this->instance['label'])), 'Required field with no value fails validation');
+    $this->assertText(t('!name field is required.', array('!name' => $this->instance['label'])), 'Required field with no value fails validation');
   }
 
 //  function testFieldFormMultiple() {
diff --git a/modules/simpletest/tests/form.test b/modules/simpletest/tests/form.test
index c1271c459..f0198abe1 100644
--- a/modules/simpletest/tests/form.test
+++ b/modules/simpletest/tests/form.test
@@ -52,7 +52,7 @@ class FormsTestCase extends DrupalWebTestCase {
     $elements['file']['empty_values'] = $empty_strings;
 
     // Regular expression to find the expected marker on required elements.
-    $required_marker_preg = '@<label.*<span class="form-required" title="This field is required\.">\*</span></label>@';
+    $required_marker_preg = '@<label.*<span class="form-required" title="This field is required\.">\*</span>.*</label>@';
 
     // Go through all the elements and all the empty values for them
     foreach ($elements as $type => $data) {
diff --git a/modules/system/system.install b/modules/system/system.install
index 9a48ca3b3..d1aaa45ff 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -1567,7 +1567,7 @@ function system_schema() {
     ),
     'primary key' => array('filename'),
     'indexes' => array(
-      'system_list' => array('status', 'weight', 'name'),
+      'system_list' => array('weight', 'name'),
       'type_name' => array('type', 'name'),
     ),
   );
@@ -2203,7 +2203,7 @@ function system_update_7018() {
   db_drop_index('system', 'bootstrap');
   db_change_field('system', 'type', 'type', array('type' => 'varchar', 'length' => 12, 'not null' => TRUE, 'default' => ''));
   db_add_index('system', 'type_name', array('type', 'name'));
-  db_add_index('system', 'system_list', array('status', 'weight', 'name'));
+  db_add_index('system', 'system_list', array('weight', 'name'));
 }
 
 /**