X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=tests%2Ftest_lintian.py;h=f4ed98efa45cde2f9f0e655e10ead4778b2bd765;hb=7c5adcf962fe99d6a42307595f263f47d0112fbc;hp=4a574a9d1a5c5fdba63d5ff3136b5a3481e19f61;hpb=cfa9081dd435e9b0fd5405c4a2aa5ecccac80312;p=dak.git

diff --git a/tests/test_lintian.py b/tests/test_lintian.py
index 4a574a9d..f4ed98ef 100755
--- a/tests/test_lintian.py
+++ b/tests/test_lintian.py
@@ -15,8 +15,12 @@ class ParseLintianTestCase(DakTestCase):
 
     def testSimple(self):
         self.assertParse(
-            'W: pkgname: some-tag path/to/file',
-            [('W', 'pkgname', 'some-tag', 'path/to/file')],
+            'W: pkgname: some-tag path/to/file', [{
+                'level': 'W',
+                'package': 'pkgname',
+                'tag': 'some-tag',
+                'description': 'path/to/file',
+            }],
         )
 
         self.assertParse('', [])
@@ -25,20 +29,32 @@ class ParseLintianTestCase(DakTestCase):
 
     def testBinaryNoDescription(self):
         self.assertParse(
-            'W: pkgname: some-tag',
-            [('W', 'pkgname', 'some-tag', '')],
+            'W: pkgname: some-tag', [{
+                'level': 'W',
+                'package': 'pkgname',
+                'tag': 'some-tag',
+                'description': '',
+            }],
         )
 
     def testSource(self):
         self.assertParse(
-            'W: pkgname source: some-tag',
-            [('W', 'pkgname source', 'some-tag', '')]
+            'W: pkgname source: some-tag', [{
+                'level': 'W',
+                'package': 'pkgname source',
+                'tag': 'some-tag',
+                'description': '',
+            }]
         )
 
     def testSourceNoDescription(self):
         self.assertParse(
-            'W: pkgname source: some-tag path/to/file',
-            [('W', 'pkgname source', 'some-tag', 'path/to/file')]
+            'W: pkgname source: some-tag path/to/file', [{
+                'level': 'W',
+                'package': 'pkgname source',
+                'tag': 'some-tag',
+                'description': 'path/to/file',
+            }]
         )
 
 class GenerateRejectMessages(DakTestCase):
@@ -47,51 +63,84 @@ class GenerateRejectMessages(DakTestCase):
         self.assertEqual(len(msgs), num)
 
     def testUnknownTag(self):
-        self.assertNumReject(
-            [('W', 'pkgname', 'unknown-tag', '')],
-            {'fatal': ['known-tag'], 'nonfatal': []},
+        self.assertNumReject([
+            {
+                'level': 'W',
+                'package': 'pkgname',
+                'tag': 'unknown-tag',
+                'description': '',
+            }
+            ], {'fatal': ['known-tag'], 'nonfatal': []},
             0,
         )
 
     def testFatalTags(self):
         self.assertNumReject([
-                ('W', 'pkgname', 'fatal-tag-1', ''),
-                ('W', 'pkgname', 'fatal-tag-2', ''),
-            ],
-            {'fatal': ['fatal-tag-1', 'fatal-tag-2'], 'nonfatal': []},
+            {
+                'level': 'W',
+                'package': 'pkgname',
+                'tag': 'fatal-tag-1',
+                'description': '',
+            },
+            {
+                'level': 'W',
+                'package': 'pkgname',
+                'tag': 'fatal-tag-2',
+                'description': '',
+            },
+            ], {'fatal': ['fatal-tag-1', 'fatal-tag-2'], 'nonfatal': []},
             2,
         )
 
     def testMixture(self):
         self.assertNumReject([
-                ('W', 'pkgname', 'fatal-tag', ''),
-                ('W', 'pkgname', 'unknown-tag', ''),
-            ],
-            {'fatal': ['fatal-tag'], 'nonfatal': []},
+            {
+                'level': 'W',
+                'package': 'pkgname',
+                'tag': 'fatal-tag',
+                'description': '',
+            },
+            {
+                'level': 'W',
+                'package': 'pkgname',
+                'tag': 'unknown-tag',
+                'description': '',
+            },
+            ], {'fatal': ['fatal-tag'], 'nonfatal': []},
             1,
         )
 
     def testOverridable(self):
         self.assertNumReject([
-                ('W', 'pkgname', 'non-fatal-tag', ''),
-            ],
-            {'fatal': [], 'nonfatal': ['non-fatal-tag']},
+            {
+                'level': 'W',
+                'package': 'pkgname',
+                'tag': 'non-fatal-tag',
+                'description': '',
+            },
+            ], {'fatal': [], 'nonfatal': ['non-fatal-tag']},
             1 + 1, # We add an extra 'reject' hint message
         )
 
     def testOverrideAllowed(self):
         self.assertNumReject([
-                ('O', 'pkgname', 'non-fatal-tag', ''),
-            ],
-            {'fatal': [], 'nonfatal': ['non-fatal-tag']},
+                {'level': 'O',
+                'package': 'pkgname',
+                'tag': 'non-fatal-tag',
+                'description': ''},
+            ], {'fatal': [], 'nonfatal': ['non-fatal-tag']},
             0,
         )
 
     def testOverrideNotAllowed(self):
         self.assertNumReject([
-                ('O', 'pkgname', 'fatal-tag', ''),
-            ],
-            {'fatal': ['fatal-tag'], 'nonfatal': []},
+            {
+                'level': 'O',
+                'package': 'pkgname',
+                'tag': 'fatal-tag',
+                'description': '',
+            },
+            ], {'fatal': ['fatal-tag'], 'nonfatal': []},
             1,
         )