manifest: Include tag in from_list() calls

1 files changed, 70 insertions, 61 deletions

diff --git a/tests/test_manifest.py b/tests/test_manifest.py
index ef95e22..aee5eba 100644
--- a/tests/test_manifest.py
+++ b/tests/test_manifest.py
@@ -55,49 +55,58 @@ class ManifestEntryTest(unittest.TestCase):
     }
 
     def test_TIMESTAMP(self):
-        self.assertEqual(gemato.manifest.ManifestEntryTIMESTAMP.from_list(('2010-01-01T11:12:13Z',)).ts,
+        self.assertEqual(gemato.manifest.ManifestEntryTIMESTAMP.from_list(
+                    ('TIMESTAMP', '2010-01-01T11:12:13Z')).ts,
                 datetime.datetime(2010, 1, 1, 11, 12, 13))
 
     def test_MANIFEST(self):
-        m = gemato.manifest.ManifestEntryMANIFEST.from_list(self.file_vals)
+        m = gemato.manifest.ManifestEntryMANIFEST.from_list(
+                ('MANIFEST',) + self.file_vals)
         self.assertEqual(m.path, 'test')
         self.assertEqual(m.size, 0)
         self.assertDictEqual(m.checksums, self.exp_cksums)
 
     def test_IGNORE(self):
-        self.assertEqual(gemato.manifest.ManifestEntryIGNORE.from_list(('test',)).path,
+        self.assertEqual(gemato.manifest.ManifestEntryIGNORE.from_list(
+                    ('IGNORE', 'test')).path,
                 'test')
 
     def test_DATA(self):
-        m = gemato.manifest.ManifestEntryDATA.from_list(self.file_vals)
+        m = gemato.manifest.ManifestEntryDATA.from_list(
+                ('DATA',) + self.file_vals)
         self.assertEqual(m.path, 'test')
         self.assertEqual(m.size, 0)
         self.assertDictEqual(m.checksums, self.exp_cksums)
 
     def test_MISC(self):
-        m = gemato.manifest.ManifestEntryMISC.from_list(self.file_vals)
+        m = gemato.manifest.ManifestEntryMISC.from_list(
+                ('MISC',) + self.file_vals)
         self.assertEqual(m.path, 'test')
         self.assertEqual(m.size, 0)
         self.assertDictEqual(m.checksums, self.exp_cksums)
 
     def test_OPTIONAL(self):
-        self.assertEqual(gemato.manifest.ManifestEntryOPTIONAL.from_list(('test',)).path,
+        self.assertEqual(gemato.manifest.ManifestEntryOPTIONAL.from_list(
+                    ('OPTIONAL', 'test')).path,
                 'test')
 
     def test_DIST(self):
-        m = gemato.manifest.ManifestEntryDIST.from_list(self.file_vals)
+        m = gemato.manifest.ManifestEntryDIST.from_list(
+                ('DIST',) + self.file_vals)
         self.assertEqual(m.path, 'test')
         self.assertEqual(m.size, 0)
         self.assertDictEqual(m.checksums, self.exp_cksums)
 
     def test_EBUILD(self):
-        m = gemato.manifest.ManifestEntryEBUILD.from_list(self.file_vals)
+        m = gemato.manifest.ManifestEntryEBUILD.from_list(
+                ('EBUILD',) + self.file_vals)
         self.assertEqual(m.path, 'test')
         self.assertEqual(m.size, 0)
         self.assertDictEqual(m.checksums, self.exp_cksums)
 
     def test_AUX(self):
-        m = gemato.manifest.ManifestEntryAUX.from_list(self.file_vals)
+        m = gemato.manifest.ManifestEntryAUX.from_list(
+                ('AUX',) + self.file_vals)
         self.assertEqual(m.aux_path, 'test')
         self.assertEqual(m.path, 'files/test')
         self.assertEqual(m.size, 0)
@@ -105,118 +114,118 @@ class ManifestEntryTest(unittest.TestCase):
 
     def test_timestamp_invalid(self):
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryTIMESTAMP.from_list, ('',))
+                gemato.manifest.ManifestEntryTIMESTAMP.from_list, ('TIMESTAMP', '',))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryTIMESTAMP.from_list, ('2017-10-22T18:06:41+02:00',))
+                gemato.manifest.ManifestEntryTIMESTAMP.from_list, ('TIMESTAMP', '2017-10-22T18:06:41+02:00',))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryTIMESTAMP.from_list, ('2017-10-22T18:06:41',))
+                gemato.manifest.ManifestEntryTIMESTAMP.from_list, ('TIMESTAMP', '2017-10-22T18:06:41',))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryTIMESTAMP.from_list, ('2017-10-22 18:06:41Z',))
+                gemato.manifest.ManifestEntryTIMESTAMP.from_list, ('TIMESTAMP', '2017-10-22 18:06:41Z',))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryTIMESTAMP.from_list, ('20171022T180641Z',))
+                gemato.manifest.ManifestEntryTIMESTAMP.from_list, ('TIMESTAMP', '20171022T180641Z',))
 
     def test_path_invalid(self):
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryMANIFEST.from_list, ('', '0'))
+                gemato.manifest.ManifestEntryMANIFEST.from_list, ('MANIFEST', '', '0'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryMANIFEST.from_list, ('/foo', '0'))
+                gemato.manifest.ManifestEntryMANIFEST.from_list, ('MANIFEST', '/foo', '0'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryIGNORE.from_list, ('',))
+                gemato.manifest.ManifestEntryIGNORE.from_list, ('IGNORE', '',))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryIGNORE.from_list, ('/foo',))
+                gemato.manifest.ManifestEntryIGNORE.from_list, ('IGNORE', '/foo',))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryOPTIONAL.from_list, ('',))
+                gemato.manifest.ManifestEntryOPTIONAL.from_list, ('OPTIONAL', '',))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryOPTIONAL.from_list, ('/foo',))
+                gemato.manifest.ManifestEntryOPTIONAL.from_list, ('OPTIONAL', '/foo',))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryDATA.from_list, ('',))
+                gemato.manifest.ManifestEntryDATA.from_list, ('DATA', '',))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryDATA.from_list, ('/foo',))
+                gemato.manifest.ManifestEntryDATA.from_list, ('DATA', '/foo',))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryMISC.from_list, ('',))
+                gemato.manifest.ManifestEntryMISC.from_list, ('MISC', '',))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryMISC.from_list, ('/foo',))
+                gemato.manifest.ManifestEntryMISC.from_list, ('MISC', '/foo',))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryDIST.from_list, ('',))
+                gemato.manifest.ManifestEntryDIST.from_list, ('DIST', '',))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryDIST.from_list, ('/foo',))
+                gemato.manifest.ManifestEntryDIST.from_list, ('DIST', '/foo',))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryDIST.from_list, ('foo/bar.gz',))
+                gemato.manifest.ManifestEntryDIST.from_list, ('DIST', 'foo/bar.gz',))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryEBUILD.from_list, ('',))
+                gemato.manifest.ManifestEntryEBUILD.from_list, ('EBUILD', '',))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryEBUILD.from_list, ('/foo',))
+                gemato.manifest.ManifestEntryEBUILD.from_list, ('EBUILD', '/foo',))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryAUX.from_list, ('',))
+                gemato.manifest.ManifestEntryAUX.from_list, ('AUX', '',))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryAUX.from_list, ('/foo',))
+                gemato.manifest.ManifestEntryAUX.from_list, ('AUX', '/foo',))
 
     def test_size_invalid(self):
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryMANIFEST.from_list, ('foo', 'asdf'))
+                gemato.manifest.ManifestEntryMANIFEST.from_list, ('MANIFEST', 'foo', 'asdf'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryMANIFEST.from_list, ('foo', '5ds'))
+                gemato.manifest.ManifestEntryMANIFEST.from_list, ('MANIFEST', 'foo', '5ds'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryMANIFEST.from_list, ('foo', '-5'))
+                gemato.manifest.ManifestEntryMANIFEST.from_list, ('MANIFEST', 'foo', '-5'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryDATA.from_list, ('foo', 'asdf'))
+                gemato.manifest.ManifestEntryDATA.from_list, ('DATA', 'foo', 'asdf'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryDATA.from_list, ('foo', '5ds'))
+                gemato.manifest.ManifestEntryDATA.from_list, ('DATA', 'foo', '5ds'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryDATA.from_list, ('foo', '-5'))
+                gemato.manifest.ManifestEntryDATA.from_list, ('DATA', 'foo', '-5'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryMISC.from_list, ('foo', 'asdf'))
+                gemato.manifest.ManifestEntryMISC.from_list, ('MISC', 'foo', 'asdf'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryMISC.from_list, ('foo', '5ds'))
+                gemato.manifest.ManifestEntryMISC.from_list, ('MISC', 'foo', '5ds'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryMISC.from_list, ('foo', '-5'))
+                gemato.manifest.ManifestEntryMISC.from_list, ('MISC', 'foo', '-5'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryDIST.from_list, ('foo', 'asdf'))
+                gemato.manifest.ManifestEntryDIST.from_list, ('DIST', 'foo', 'asdf'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryDIST.from_list, ('foo', '5ds'))
+                gemato.manifest.ManifestEntryDIST.from_list, ('DIST', 'foo', '5ds'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryDIST.from_list, ('foo', '-5'))
+                gemato.manifest.ManifestEntryDIST.from_list, ('DIST', 'foo', '-5'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryEBUILD.from_list, ('foo', 'asdf'))
+                gemato.manifest.ManifestEntryEBUILD.from_list, ('EBUILD', 'foo', 'asdf'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryEBUILD.from_list, ('foo', '5ds'))
+                gemato.manifest.ManifestEntryEBUILD.from_list, ('EBUILD', 'foo', '5ds'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryEBUILD.from_list, ('foo', '-5'))
+                gemato.manifest.ManifestEntryEBUILD.from_list, ('EBUILD', 'foo', '-5'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryAUX.from_list, ('foo', 'asdf'))
+                gemato.manifest.ManifestEntryAUX.from_list, ('AUX', 'foo', 'asdf'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryAUX.from_list, ('foo', '5ds'))
+                gemato.manifest.ManifestEntryAUX.from_list, ('AUX', 'foo', '5ds'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryAUX.from_list, ('foo', '-5'))
+                gemato.manifest.ManifestEntryAUX.from_list, ('AUX', 'foo', '-5'))
 
     def test_checksum_short(self):
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryMANIFEST.from_list, ('foo', '0', 'md5'))
+                gemato.manifest.ManifestEntryMANIFEST.from_list, ('MANIFEST', 'foo', '0', 'md5'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
                 gemato.manifest.ManifestEntryMANIFEST.from_list,
-                ('foo', '0', 'md5', 'd41d8cd98f00b204e9800998ecf8427e', 'sha1'))
+                ('MANIFEST', 'foo', '0', 'md5', 'd41d8cd98f00b204e9800998ecf8427e', 'sha1'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryDATA.from_list, ('foo', '0', 'md5'))
+                gemato.manifest.ManifestEntryDATA.from_list, ('DATA', 'foo', '0', 'md5'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
                 gemato.manifest.ManifestEntryDATA.from_list,
-                ('foo', '0', 'md5', 'd41d8cd98f00b204e9800998ecf8427e', 'sha1'))
+                ('DATA', 'foo', '0', 'md5', 'd41d8cd98f00b204e9800998ecf8427e', 'sha1'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryMISC.from_list, ('foo', '0', 'md5'))
+                gemato.manifest.ManifestEntryMISC.from_list, ('MISC', 'foo', '0', 'md5'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
                 gemato.manifest.ManifestEntryMISC.from_list,
-                ('foo', '0', 'md5', 'd41d8cd98f00b204e9800998ecf8427e', 'sha1'))
+                ('MISC', 'foo', '0', 'md5', 'd41d8cd98f00b204e9800998ecf8427e', 'sha1'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryDIST.from_list, ('foo', '0', 'md5'))
+                gemato.manifest.ManifestEntryDIST.from_list, ('DIST', 'foo', '0', 'md5'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
                 gemato.manifest.ManifestEntryDIST.from_list,
-                ('foo', '0', 'md5', 'd41d8cd98f00b204e9800998ecf8427e', 'sha1'))
+                ('DIST', 'foo', '0', 'md5', 'd41d8cd98f00b204e9800998ecf8427e', 'sha1'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryEBUILD.from_list, ('foo', '0', 'md5'))
+                gemato.manifest.ManifestEntryEBUILD.from_list, ('EBUILD', 'foo', '0', 'md5'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
                 gemato.manifest.ManifestEntryEBUILD.from_list,
-                ('foo', '0', 'md5', 'd41d8cd98f00b204e9800998ecf8427e', 'sha1'))
+                ('EBUILD', 'foo', '0', 'md5', 'd41d8cd98f00b204e9800998ecf8427e', 'sha1'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
-                gemato.manifest.ManifestEntryAUX.from_list, ('foo', '0', 'md5'))
+                gemato.manifest.ManifestEntryAUX.from_list, ('AUX', 'foo', '0', 'md5'))
         self.assertRaises(gemato.manifest.ManifestSyntaxError,
                 gemato.manifest.ManifestEntryAUX.from_list,
-                ('foo', '0', 'md5', 'd41d8cd98f00b204e9800998ecf8427e', 'sha1'))
+                ('AUX', 'foo', '0', 'md5', 'd41d8cd98f00b204e9800998ecf8427e', 'sha1'))