diff options
| author | Colin Watson <cjwatson@canonical.com> | 2012-11-19 13:25:49 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@canonical.com> | 2012-11-19 13:25:49 +0000 |
| commit | 116aa6eec9cf830d81c45ff257f16d7472e5314b (patch) | |
| tree | 6b60bc8fb402a2b789153d5f0e6db33112566858 | |
| parent | a0ecfe1c745e07c41c85b80d747b19179341531d (diff) | |
| download | python-apt-116aa6eec9cf830d81c45ff257f16d7472e5314b.tar.gz | |
* tests/test_debfile_multiarch.py:
- Don't log warnings when skipping tests; the resulting stderr output
causes autopkgtest to fail.
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | tests/test_debfile_multiarch.py | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index d9083659..25125971 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ python-apt (0.8.8ubuntu4) UNRELEASED; urgency=low * aptsources/distinfo.py, aptsources/distro.py, aptsources/sourceslist.py, tests/test_apt_cache.py, tests/test_debfile_multiarch.py: - Use logging.warning rather than the deprecated logging.warn. + * tests/test_debfile_multiarch.py: + - Don't log warnings when skipping tests; the resulting stderr output + causes autopkgtest to fail. -- Colin Watson <cjwatson@ubuntu.com> Mon, 19 Nov 2012 11:57:28 +0000 diff --git a/tests/test_debfile_multiarch.py b/tests/test_debfile_multiarch.py index 8da070aa..5e6d0b9a 100644 --- a/tests/test_debfile_multiarch.py +++ b/tests/test_debfile_multiarch.py @@ -23,7 +23,8 @@ class TestDebfileMultiarch(unittest.TestCase): def test_multiarch_deb_check(self): if apt_pkg.get_architectures() != ["amd64", "i386"]: - logging.warning("skipping test because running on a non-multiarch system") + # TODO: use unittest.skip + #logging.warning("skipping test because running on a non-multiarch system") return deb = apt.debfile.DebPackage( "./data/test_debs/multiarch-test1_i386.deb") @@ -37,7 +38,8 @@ class TestDebfileMultiarch(unittest.TestCase): # use "lib3ds-1-3" as a test to see if non-multiach lib conflicts work canary = "lib3ds-1-3" if not canary in cache: - logging.warning("skipping test because %s is missing" % canary) + # TODO: use unittest.skip + #logging.warning("skipping test because %s is missing" % canary) return cache[canary].mark_install() deb = apt.debfile.DebPackage( |