diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | tests/test_lp1030278.py | 22 | ||||
| -rw-r--r-- | tests/test_size_to_str.py | 106 |
3 files changed, 110 insertions, 22 deletions
diff --git a/debian/changelog b/debian/changelog index 894502e2..4c784220 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ python-apt (0.8.8) UNRELEASED; urgency=low - Only support long (v4) keyids when downloading keys and check the keys fingerprint before importing. This avoids man-in-the-middle attacks (LP: #1016643) + * consolidate tests/test_lp1030278.py into the new + tests/test_size_to_str.py [ Barry Warsaw ] * python/string.cc, tests/test_lp1030278.py: Fix StrSizeToStr() so that @@ -25,6 +27,8 @@ python-apt (0.8.8) UNRELEASED; urgency=low [ James Hunt ] * python/cache.cc: PkgCacheGetIsMultiArch(): Return calculated value rather than a random one. + * lp:~jamesodhunt/python-apt/test-for-size_to_str: + - add test for size_to_str() to help with finding LP: #1030278 -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 01 Oct 2012 13:30:53 +0200 diff --git a/tests/test_lp1030278.py b/tests/test_lp1030278.py deleted file mode 100644 index 1cbc2c18..00000000 --- a/tests/test_lp1030278.py +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -"""Regression test for LP: #1030278""" - -__author__ = "Barry Warsaw <barry@ubuntu.com>" - -import unittest -import apt_pkg - - -class RegressionTestCase(unittest.TestCase): - - def test_no_overflow_error(self): - # LP: #1030278 produces an overflow error in size_to_str() with a big - # value under Python 3. - self.assertEqual(apt_pkg.size_to_str(2147483648000000000000), '2147 E') - - -if __name__ == "__main__": - unittest.main() - -# vim: ts=4 et sts=4 diff --git a/tests/test_size_to_str.py b/tests/test_size_to_str.py new file mode 100644 index 00000000..8be931ca --- /dev/null +++ b/tests/test_size_to_str.py @@ -0,0 +1,106 @@ +#!/usr/bin/python + +__author__ = "Barry Warsaw <barry@ubuntu.com>, James Hunt, Michael Vogt" + + +import unittest +import apt_pkg + + +class SizeToStrTestCase(unittest.TestCase): + """Test apt_pkg.size_to_str""" + + DATA = { + # XXX: note the trailing spaces for some of these entries! + 10 ** 1 : "10 ", + 10 ** 2 : "100 ", + 10 ** 3 : "1000 ", + 10 ** 4 : "10.0 k", + 10 ** 5 : "100 k", + 10 ** 6 : "1000 k", + 10 ** 7 : "10.0 M", + 10 ** 8 : "100 M", + 10 ** 9 : "1000 M", + 10 ** 10 : "10.0 G", + 10 ** 11 : "100 G", + 10 ** 12 : "1000 G", + 10 ** 13 : "10.0 T", + 10 ** 14 : "100 T", + 10 ** 15 : "1000 T", + 10 ** 16 : "10.0 P", + 10 ** 17 : "100 P", + 10 ** 18 : "1000 P", + 10 ** 19 : "10.0 E", + 10 ** 20 : "100 E", + 10 ** 21 : "1000 E", + 10 ** 22 : "10.0 Z", + 10 ** 23 : "100.0 Z", + 10 ** 24 : "1000 Z", + 10 ** 25 : "10.0 Y", + 10 ** 26 : "100 Y", + 10 ** 27 : "1000 Y", + + # That's our limit :) + 10 ** 28 : "10000 Y", + + 0 : "0 ", + 1 : "1 ", + 1024 : "1024 ", + 10240 : "10.2 k", + 102400 : "102 k", + 1024000 : "1024 k", + 10240000 : "10.2 M", + 102400000 : "102 M", + 2147483647 : "2147 M", + 2147483648 : "2147 M", + 1024000000 : "1024 M", + 10240000000 : "10.2 G", + + 9 : "9 ", + 99 : "99 ", + 999 : "999 ", + 9999 : "9999 ", + 99999 : "100.0 k", + 999999 : "1000 k", + 9999999 : "10000 k", + 99999999 : "100.0 M", + 999999999 : "1000 M", + 9999999999 : "10000 M", + 99999999999 : "100.0 G", + 999999999999 : "1000 G", + 9999999999999 : "10000 G", + 99999999999999 : "100.0 T", + 999999999999999 : "1000 T", + 9999999999999999 : "10.0 P", + 99999999999999999 : "100 P", + 999999999999999999 : "1000 P", + 9999999999999999999 : "10.0 E", + 99999999999999999999 : "100 E", + 999999999999999999999 : "1000 E", + 9999999999999999999999 : "10.0 Z", + 999999999999999999999999 : "1000 Z", + } + + def test_from_data(self): + for k, v in self.DATA.items(): + size = apt_pkg.size_to_str(k) + msg = "size_to_str(%s) returned '%s', expected '%s'" % (k, size, v) + self.assertEqual(size, v, msg) + + def test_raise_on_unsupported(self): + for v in ["hello", None, {}, [], ()]: + with self.assertRaises(TypeError): + apt_pkg.size_to_str(v) + + +class RegressionTestCase(unittest.TestCase): + """Regression test for LP: #1030278""" + + def test_no_overflow_error(self): + # LP: #1030278 produces an overflow error in size_to_str() with a big + # value under Python 3. + self.assertEqual(apt_pkg.size_to_str(2147483648000000000000), '2147 E') + + +if __name__ == "__main__": + unittest.main() |