From b7b608bf2c66e7466313ea02568348aea9cc29ba Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 22 Nov 2011 18:01:26 +0100 Subject: cleanup based on feedback from juliank --- tests/test_debfile.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/test_debfile.py b/tests/test_debfile.py index 501b8f61..e6c475d3 100644 --- a/tests/test_debfile.py +++ b/tests/test_debfile.py @@ -88,11 +88,6 @@ class TestDebfilee(unittest.TestCase): "Samuel Lidén Borell ") def test_content(self): - # no python-debian for python3 yet, so fail gracefully - try: - import debian - except ImportError: - return # normal deb = apt.debfile.DebPackage(cache=self.cache) deb.open(os.path.join("data", "test_debs", "gdebi-test11.deb")) @@ -119,6 +114,13 @@ Description: testpackage for gdebi - contains usr/bin/binary for file reading deb = apt.debfile.DebPackage("./data/test_debs/data-tar-xz.deb") self.assertEqual(deb.filelist, ["./", "usr/", "usr/bin/"]) + def test_check_exception(self): + deb = apt.debfile.DebPackage("./data/test_debs/data-tar-xz.deb") + with self.assertRaises(ValueError): + deb.missing_deps + deb.check() + deb.missing_deps + def test_no_supported_data_tar(self): # ensure that a unknown data.tar.xxx raises a exception raised = False -- cgit v1.2.3 From b1c645c534e14bc21da638aefd54d2c59085f3ec Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 22 Nov 2011 18:09:44 +0100 Subject: tests/test_debfile.py: fix test after previous exception change --- tests/test_debfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/test_debfile.py b/tests/test_debfile.py index e6c475d3..89f50d2a 100644 --- a/tests/test_debfile.py +++ b/tests/test_debfile.py @@ -116,7 +116,7 @@ Description: testpackage for gdebi - contains usr/bin/binary for file reading def test_check_exception(self): deb = apt.debfile.DebPackage("./data/test_debs/data-tar-xz.deb") - with self.assertRaises(ValueError): + with self.assertRaises(AttributeError): deb.missing_deps deb.check() deb.missing_deps -- cgit v1.2.3 From ff886d6a8c468a31433013250aed337dfe0770cc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 22 Nov 2011 18:32:56 +0100 Subject: tests/test_debfile.py: remove debug print --- tests/test_debfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/test_debfile.py b/tests/test_debfile.py index 89f50d2a..7619f33d 100644 --- a/tests/test_debfile.py +++ b/tests/test_debfile.py @@ -133,7 +133,7 @@ Description: testpackage for gdebi - contains usr/bin/binary for file reading self.assertTrue(raised) def test_multiarch_deb(self): - print apt_pkg.get_architectures() + #print apt_pkg.get_architectures() if apt_pkg.get_architectures() != ["amd64", "i386"]: logging.warn("skipping test because running on a non-multiarch system") return -- cgit v1.2.3 From bdf3dfdca30b0d822d267b8453dd1101e864d276 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 22 Nov 2011 18:45:23 +0100 Subject: tests/test_apt_cache.py: fix test failure by explicitely setting rootdir --- tests/test_apt_cache.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py index 0d80f617..74d94ed8 100644 --- a/tests/test_apt_cache.py +++ b/tests/test_apt_cache.py @@ -182,7 +182,7 @@ class TestAptCache(unittest.TestCase): apt_pkg.config.set("dir::etc::sourceparts", old_source_parts) def test_package_cmp(self): - cache = apt.Cache() + cache = apt.Cache(rootdir="/") l = [] l.append(cache["libc6"]) l.append(cache["xterm"]) -- cgit v1.2.3 From ea348ef49c34f22c8f06cdbcbcae3c2fbc7652fd Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 22 Nov 2011 18:51:57 +0100 Subject: tests/test_debfile.py: fix test on python2.6 --- tests/test_debfile.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/test_debfile.py b/tests/test_debfile.py index 7619f33d..30a2be0a 100644 --- a/tests/test_debfile.py +++ b/tests/test_debfile.py @@ -116,8 +116,7 @@ Description: testpackage for gdebi - contains usr/bin/binary for file reading def test_check_exception(self): deb = apt.debfile.DebPackage("./data/test_debs/data-tar-xz.deb") - with self.assertRaises(AttributeError): - deb.missing_deps + self.assertRaises(AttributeError, lambda: deb.missing_deps) deb.check() deb.missing_deps -- cgit v1.2.3 From d76a13a50fda292fe011a86f2b761d5753dc1470 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 22 Nov 2011 18:58:06 +0100 Subject: tests/test_debfile.py: remove unneeded debug print --- tests/test_debfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/test_debfile.py b/tests/test_debfile.py index 30a2be0a..d7c38b3d 100644 --- a/tests/test_debfile.py +++ b/tests/test_debfile.py @@ -137,7 +137,7 @@ Description: testpackage for gdebi - contains usr/bin/binary for file reading logging.warn("skipping test because running on a non-multiarch system") return deb = apt.debfile.DebPackage("./data/test_debs/multiarch-test1_i386.deb") - print deb.missing_deps() + #print deb.missing_deps() -- cgit v1.2.3