X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=tests%2Ftest_parse_changes.py;h=65c0666a5a49cf92c12f8077d56ff47d8480fcb2;hb=7c5adcf962fe99d6a42307595f263f47d0112fbc;hp=de0202e0847a55701eba151c439b168cc3301c53;hpb=47955ee9a5730c81b21ca9f31da4c176a82bcdc4;p=dak.git

diff --git a/tests/test_parse_changes.py b/tests/test_parse_changes.py
index de0202e0..65c0666a 100755
--- a/tests/test_parse_changes.py
+++ b/tests/test_parse_changes.py
@@ -4,62 +4,80 @@ from base_test import DakTestCase, fixture
 
 import unittest
 
-from daklib.utils import parse_changes
+from daklib.gpg import GpgException
+from daklib.utils import parse_changes, check_dsc_files, build_file_list
 from daklib.dak_exceptions import InvalidDscError, ParseChangesError
 
 class ParseChangesTestCase(DakTestCase):
     def assertParse(self, filename, *args):
         return parse_changes(fixture(filename), *args)
 
-    def assertFails(self, filename, line=None, *args):
-        try:
-            self.assertParse(filename, *args)
-            self.fail('%s was not recognised as invalid' % filename)
-        except ParseChangesError:
-            pass
-        except InvalidDscError, actual_line:
-            if line is not None:
-                assertEqual(actual_line, line)
-
 class ParseDscTestCase(ParseChangesTestCase):
     def test_1(self):
-        self.assertParse('dsc/1.dsc')
+        changes = self.assertParse('dsc/1.dsc', -1, 1)
+        files = build_file_list(changes, 1)
+        rejmsg = check_dsc_files('1.dsc', changes, files.keys())
+        self.assertEqual(rejmsg, [])
 
     def test_1_ignoreErrors(self):
         # Valid .dsc ; ignoring errors
-        self.assertParse('dsc/1.dsc', 0)
+        self.assertParse('dsc/1.dsc', -1, 1)
 
     def test_2(self):
         # Missing blank line before signature body
-        self.assertFails('dsc/2.dsc', line=14)
+        self.assertParse('dsc/2.dsc', -1, 1)
 
     def test_2_ignoreErrors(self):
         # Invalid .dsc ; ignoring errors
-        self.assertParse('dsc/2.dsc', 0)
+        self.assertParse('dsc/2.dsc', -1, 1)
 
     def test_3(self):
         # Missing blank line after signature header
-        self.assertFails('dsc/3.dsc', line=14)
+        self.assertParse('dsc/3.dsc', -1, 1)
 
     def test_4(self):
         # No blank lines at all
-        self.assertFails('dsc/4.dsc', line=19)
+        with self.assertRaises(GpgException):
+            self.assertParse('dsc/4.dsc', -1, 1)
 
     def test_5(self):
         # Extra blank line before signature body
-        self.assertFails('dsc/5.dsc', line=15)
+        self.assertParse('dsc/5.dsc', -1, 1)
 
     def test_6(self):
         # Extra blank line after signature header
-        self.assertFails('dsc/6.dsc', line=5)
+        self.assertParse('dsc/6.dsc', -1, 1)
+
+    def test_7(self):
+        # Blank file is an invalid armored GPG file
+        with self.assertRaises(GpgException):
+            self.assertParse('dsc/7.dsc', -1, 1)
+
+    def test_8(self):
+        # No armored contents
+        with self.assertRaisesRegexp(ParseChangesError, "Empty changes"):
+            self.assertParse('dsc/8.dsc', -1, 1)
+
+    def test_9(self):
+        changes = self.assertParse('dsc/9.dsc', -1, 1)
+        self.assert_(changes['question'] == 'Is this a bug?')
+        self.failIf(changes.get('this'))
+
+    def test_10(self):
+        changes = self.assertParse('dsc/10.dsc', -1, 1)
+        files = build_file_list(changes, 1)
+        rejmsg = check_dsc_files('10.dsc', changes, files.keys())
+        self.assertEqual(rejmsg, ['10.dsc: contains source files not allowed in format 1.0'])
+
 
 class ParseChangesTestCase(ParseChangesTestCase):
     def test_1(self):
         # Empty changes
-        self.assertFails('changes/1.changes', line=5)
+        with self.assertRaises(GpgException):
+            self.assertParse('changes/1.changes', 1)
 
     def test_2(self):
-        changes = self.assertParse('changes/2.changes', 0)
+        changes = self.assertParse('changes/2.changes', -1)
 
         binaries = changes['binary']
 
@@ -67,7 +85,7 @@ class ParseChangesTestCase(ParseChangesTestCase):
 
     def test_3(self):
         for filename in ('valid', 'bogus-pre', 'bogus-post'):
-            for strict_whitespace in (0, 1):
+            for strict_whitespace in (-1,):
                 changes = self.assertParse(
                     'changes/%s.changes' % filename,
                     strict_whitespace,