This branch is based on lp:~adeuring/launchpad/hwdb-submissions-with-udev-data and adds some tests for the changed RelaxNG schema for HWDB submissions. (see also the MP https://code.edge.launchpad.net/~adeuring/launchpad/hwdb-submissions-with-udev-data/+merge/11683 for a exlanation what this branch is about)

These tests modify the existing sample submission file by inserting more data, or by replacing/removing sme data from the file.

The new tests ensure that:

- the new tga <kernel-release value="whatever"/> can be inserted into <summary>
- the <hal> node can be replaced by the three node <udev>, <dmi>, <sysfs-attributes>
- <hal> may not be mixed with <udev>, <dmi>, <sysfs-attributes>

The diff against the base branch:

=== modified file 'lib/canonical/launchpad/scripts/tests/test_hwdb_submission_validation.py'
--- lib/canonical/launchpad/scripts/tests/test_hwdb_submission_validation.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/scripts/tests/test_hwdb_submission_validation.py	2009-09-14 11:42:30 +0000
@@ -375,8 +375,20 @@
 
         The only allowed tags are specified by the Relax NG schema:
         live_cd, system_id, distribution, distroseries, architecture,
-        private, contactable, date_created.
+        private, contactable, date_created (tested in
+        testSummaryRequiredTags()), and the optional tag <kernel-release>.
         """
+        # we can add the tag <kernel-release>
+        sample_data = self.insertSampledata(
+            data=self.sample_data,
+            insert_text='<kernel-release value="2.6.28-15-generic"/>',
+            where='</summary>')
+        result, submission_id = self.runValidator(sample_data)
+        self.assertNotEqual(
+            result, None,
+            'Valid submission containing a <kernel-release> tag rejected.')
+
+        # Adding any other tag is not possible.
         sample_data = self.insertSampledata(
             data=self.sample_data,
             insert_text='<nonsense/>',
@@ -609,24 +621,100 @@
             'Invalid attribute foo for element plugin',
             'invalid attribute in client plugin')
 
-    def testHardwareSubTags(self):
+    def testHardwareSubTagHalOrUdev(self):
+        """The <hardware> tag requires data about hardware devices.
+
+        This data is stored either in the sub-tag <hal> or in the
+        three tags <udev>, <dmi>, <sysfs-attributes>.
+        """
+        # Omitting <hal> leads to an error.
+        sample_data = self.replaceSampledata(
+            data=self.sample_data,
+            replace_text='',
+            from_text='<hal',
+            to_text='</hal>')
+        result, submission_id = self.runValidator(sample_data)
+        self.assertErrorMessage(
+            submission_id, result,
+            'Expecting an element hal, got nothing',
+            'missing tag <hal> in <hardware>')
+
+        # But we may replace <hal> by the three tags <udev>, <dmi>,
+        #<sysfs-attributes>.
+        sample_data = self.replaceSampledata(
+            data=self.sample_data,
+            replace_text="""
+               <udev>some text</udev>
+               <dmi>some text</dmi>
+               <sysfs-attributes>some text</sysfs-attributes>
+            """,
+            from_text='<hal',
+            to_text='</hal>')
+        result, submission_id = self.runValidator(sample_data)
+        self.assertNotEqual(
+            result, None,
+            'submission with valid <udev>, <dmi>, <sysfs-attributes> tags '
+            'rejected')
+
+    def testHardwareSubTagUdevIncomplete(self):
         """The <hardware> tag has a fixed set of allowed sub-tags.
 
-        Valid sub-tags are <hal>, <processors>, <aliases>.
-        <aliases> is optional; <hal> and <processors> are required.
+        Valid sub-tags are <hal>, <udev>, <dmi>, <sysfs-attributes>,
+        <processors>, <aliases>. <aliases> is optional, <processors>
+        is required, and either <hal> or all three tags <udev>, <dmi>,
+        <sysfs-attributes> must be present.
         """
-        # Omitting either of the required tags leads on an error.
-        for tag in ('hal', 'processors'):
+        # Omitting any of the three tags <udev>, <dmi>, <sysfs-attributes>
+        # makes the data invalid.
+        all_tags = ['udev', 'dmi', 'sysfs-attributes']
+        for index in range(len(all_tags)):
+            test_tags = all_tags[:]
+            missing_tag = test_tags[index]
+            del test_tags[index]
+            replace_text = [
+                '<%s>text</%s>' % (tag, tag) for tag in test_tags]
+            replace_text = ''.join(replace_text)
             sample_data = self.replaceSampledata(
                 data=self.sample_data,
-                replace_text='',
-                from_text='<%s' % tag,
-                to_text='</%s>' % tag)
-            result, submission_id = self.runValidator(sample_data)
-            self.assertErrorMessage(
-                submission_id, result,
-                'Expecting an element %s, got nothing' % tag,
-                'missing tag <%s> in <hardware>' % tag)
+                replace_text=replace_text,
+                from_text='<hal',
+                to_text='</hal>')
+            result, submission_id = self.runValidator(sample_data)
+            self.assertErrorMessage(
+                submission_id, result,
+                'Expecting an element %s, got nothing' % missing_tag,
+                'missing tag <%s> in <hardware>' % missing_tag)
+
+    def testHardwareSubTagHalMixedWithUdev(self):
+        """Mixing <hal> with <udev>, <dmi>, <sysfs-attributes> is impossible.
+        """
+        # A submission containing the tag <hal> as well as one of <udev>,
+        # <dmi>, <sysfs-attributes> is invalid.
+        for tag in ['udev', 'dmi', 'sysfs-attributes']:
+            sample_data = self.insertSampledata(
+                data=self.sample_data,
+                insert_text='<%s>some text</%s>' % (tag, tag),
+                where='<hal')
+            result, submission_id = self.runValidator(sample_data)
+            self.assertErrorMessage(
+                submission_id, result,
+                'Invalid sequence in interleave',
+                '<hal> mixed with <%s> in <hardware>' % tag)
+
+    def testHardwareOtherSubTags(self):
+        """The <hardware> tag has a fixed set of allowed sub-tags.
+        """
+        # The <processors> tag must not be omitted.
+        sample_data = self.replaceSampledata(
+            data=self.sample_data,
+            replace_text='',
+            from_text='<processors',
+            to_text='</processors>')
+        result, submission_id = self.runValidator(sample_data)
+        self.assertErrorMessage(
+            submission_id, result,
+            'Expecting an element processors, got nothing',
+            '<processor> tag omitted')
 
         # The <aliases> tag may be omitted.
         sample_data = self.replaceSampledata(
@@ -1603,23 +1691,12 @@
             'Extra element aliases in interleave',
             'missing attribute of <alias>')
 
-        # target must be an integer.
+        # The value of target does not have to be an integer.
         sample_data = self.sample_data.replace(
             '<alias target="65">', '<alias target="noInteger">')
         result, submission_id = self.runValidator(sample_data)
-        self.assertErrorMessage(
-            submission_id, result,
-            'Extra element aliases in interleave',
-            'missing attribute of <alias>')
-
-        # target must not be empty.
-        sample_data = self.sample_data.replace(
-            '<alias target="65">', '<alias target="">')
-        result, submission_id = self.runValidator(sample_data)
-        self.assertErrorMessage(
-            submission_id, result,
-            'Element hardware failed to validate content',
-            'missing attribute of <alias>')
+        self.assertNotEqual(
+            result, None, '<alias target="noInteger"> rejected')
 
         # Other attributes are not allowed. We get again the same
         # quite unspecific error message as above.