diff options
Diffstat (limited to 'tests/test_recursiveloader.py')
| -rw-r--r-- | tests/test_recursiveloader.py | 46 |
1 files changed, 2 insertions, 44 deletions
diff --git a/tests/test_recursiveloader.py b/tests/test_recursiveloader.py index 380ce34..61969a0 100644 --- a/tests/test_recursiveloader.py +++ b/tests/test_recursiveloader.py @@ -304,13 +304,6 @@ DATA test 0 MD5 d41d8cd98f00b204e9800998ecf8427e self.assertRaises(gemato.exceptions.ManifestMismatch, m.assert_directory_verifies, 'sub') - def test_assert_directory_verifies_stray_file_nonstrict(self): - m = gemato.recursiveloader.ManifestRecursiveLoader( - os.path.join(self.dir, 'Manifest')) - self.assertRaises(gemato.exceptions.ManifestMismatch, - m.assert_directory_verifies, 'sub', - warn_handler=lambda x: True) - def test_assert_directory_verifies_stray_file_nofail(self): m = gemato.recursiveloader.ManifestRecursiveLoader( os.path.join(self.dir, 'Manifest')) @@ -341,12 +334,6 @@ DATA test 0 MD5 d41d8cd98f00b204e9800998ecf8427e os.path.join(self.dir, 'sub')]), 1) - def test_cli_verifies_stray_file_nonstrict(self): - self.assertEqual( - gemato.cli.main(['gemato', 'verify', '--no-strict', - os.path.join(self.dir, 'sub')]), - 1) - def test_cli_fails_without_signed_manifest(self): self.assertEqual( gemato.cli.main(['gemato', 'verify', @@ -1483,18 +1470,6 @@ MISC foo 0 MD5 d41d8cd98f00b204e9800998ecf8427e self.assertRaises(gemato.exceptions.ManifestMismatch, m.assert_directory_verifies, '') - def test_assert_directory_verifies_nonstrict(self): - m = gemato.recursiveloader.ManifestRecursiveLoader( - os.path.join(self.dir, 'Manifest')) - self.assertTrue(m.assert_directory_verifies('', - warn_handler=lambda x: True)) - - def test_assert_directory_verifies_nonstrict_false(self): - m = gemato.recursiveloader.ManifestRecursiveLoader( - os.path.join(self.dir, 'Manifest')) - self.assertFalse(m.assert_directory_verifies('', - warn_handler=lambda x: False)) - def test_assert_directory_verifies_nonstrict_via_fail_handler(self): m = gemato.recursiveloader.ManifestRecursiveLoader( os.path.join(self.dir, 'Manifest')) @@ -1506,11 +1481,6 @@ MISC foo 0 MD5 d41d8cd98f00b204e9800998ecf8427e gemato.cli.main(['gemato', 'verify', self.dir]), 1) - def test_cli_verifies_nonstrict(self): - self.assertEqual( - gemato.cli.main(['gemato', 'verify', '--no-strict', self.dir]), - 0) - def test_update_entry_for_path(self): m = gemato.recursiveloader.ManifestRecursiveLoader( os.path.join(self.dir, 'Manifest')) @@ -1561,19 +1531,13 @@ DATA sub/version 0 MD5 d41d8cd98f00b204e9800998ecf8427e os.path.join(self.dir, 'Manifest')) self.assertRaises(gemato.exceptions.ManifestCrossDevice, m.assert_directory_verifies, '', - fail_handler=lambda x: True, - warn_handler=lambda x: True) + fail_handler=lambda x: True) def test_cli_verifies(self): self.assertEqual( gemato.cli.main(['gemato', 'verify', self.dir]), 1) - def test_cli_verifies_nonstrict(self): - self.assertEqual( - gemato.cli.main(['gemato', 'verify', '--no-strict', self.dir]), - 1) - def test_update_entries_for_directory(self): m = gemato.recursiveloader.ManifestRecursiveLoader( os.path.join(self.dir, 'Manifest'), @@ -1613,19 +1577,13 @@ class CrossDeviceEmptyManifestTest(TempDirTestCase): os.path.join(self.dir, 'Manifest')) self.assertRaises(gemato.exceptions.ManifestCrossDevice, m.assert_directory_verifies, '', - fail_handler=lambda x: True, - warn_handler=lambda x: True) + fail_handler=lambda x: True) def test_cli_verifies(self): self.assertEqual( gemato.cli.main(['gemato', 'verify', self.dir]), 1) - def test_cli_verifies_nonstrict(self): - self.assertEqual( - gemato.cli.main(['gemato', 'verify', '--no-strict', self.dir]), - 1) - def test_update_entries_for_directory(self): m = gemato.recursiveloader.ManifestRecursiveLoader( os.path.join(self.dir, 'Manifest'), |