[python-debian/master] debian_support: split tests into tests/test_debian_support.py
John Wright
jsw at debian.org
Sun Mar 14 10:26:14 UTC 2010
---
debian/changelog | 2 +
debian/rules | 2 +-
lib/debian/debian_support.py | 59 --------------
tests/test_debian_support.py | 182 ++++++++++++++++++++++++++++++++++++++++++
4 files changed, 185 insertions(+), 60 deletions(-)
create mode 100755 tests/test_debian_support.py
diff --git a/debian/changelog b/debian/changelog
index c2b99d8..3ba5f93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,8 @@ python-debian (0.1.15) UNRELEASED; urgency=low
* changelog: Use debian_support.Version directly
* Deprecate the 'debian_bundle' package in favor of a new 'debian'
package (Closes: #570210)
+ * debian_support: split tests into tests/test_debian_support.py for
+ consistency
-- John Wright <jsw at debian.org> Sat, 13 Mar 2010 21:53:18 -0700
diff --git a/debian/rules b/debian/rules
index dc4360d..9602cea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,8 +21,8 @@ build-stamp: setup.py
cd tests && ./test_debfile.py
cd tests && ./test_debtags.py
cd tests && ./test_changelog.py
+ cd tests && ./test_debian_support.py
- python lib/debian/debian_support.py
lib/debian/doc-debtags > README.debtags
touch $@
diff --git a/lib/debian/debian_support.py b/lib/debian/debian_support.py
index d216bba..3fe8f52 100644
--- a/lib/debian/debian_support.py
+++ b/lib/debian/debian_support.py
@@ -591,62 +591,3 @@ def merge_as_sets(*args):
return l
mergeAsSets = function_deprecated_by(merge_as_sets)
-
-def test():
- # Version
- for (cls1, cls2) in [(AptPkgVersion, AptPkgVersion),
- (AptPkgVersion, NativeVersion),
- (NativeVersion, AptPkgVersion),
- (NativeVersion, NativeVersion),
- (str, AptPkgVersion), (AptPkgVersion, str),
- (str, NativeVersion), (NativeVersion, str)]:
- assert cls1('0') < cls2('a')
- assert cls1('1.0') < cls2('1.1')
- assert cls1('1.2') < cls2('1.11')
- assert cls1('1.0-0.1') < cls2('1.1')
- assert cls1('1.0-0.1') < cls2('1.0-1')
- assert cls1('1.0') == cls2('1.0')
- assert cls1('1.0-0.1') == cls2('1.0-0.1')
- assert cls1('1:1.0-0.1') == cls2('1:1.0-0.1')
- assert cls1('1:1.0') == cls2('1:1.0')
- assert cls1('1.0-0.1') < cls2('1.0-1')
- assert cls1('1.0final-5sarge1') > cls2('1.0final-5') \
- > cls2('1.0a7-2')
- assert cls1('0.9.2-5') < cls2('0.9.2+cvs.1.0.dev.2004.07.28-1.5')
- assert cls1('1:500') < cls2('1:5000')
- assert cls1('100:500') > cls2('11:5000')
- assert cls1('1.0.4-2') > cls2('1.0pre7-2')
- assert cls1('1.5~rc1') < cls2('1.5')
- assert cls1('1.5~rc1') < cls2('1.5+b1')
- assert cls1('1.5~rc1') < cls2('1.5~rc2')
- assert cls1('1.5~rc1') > cls2('1.5~dev0')
-
- # Release
- assert intern_release('sarge') < intern_release('etch')
-
- # PackageFile
- # for p in PackageFile('../../data/packages/sarge/Sources'):
- # assert p[0][0] == 'Package'
- # for p in PackageFile('../../data/packages/sarge/Packages.i386'):
- # assert p[0][0] == 'Package'
-
- # Helper routines
- assert read_lines_sha1([]) == 'da39a3ee5e6b4b0d3255bfef95601890afd80709'
- assert read_lines_sha1(['1\n', '23\n']) \
- == '14293c9bd646a15dc656eaf8fba95124020dfada'
-
- file_a = map(lambda x: "%d\n" % x, range(1, 18))
- file_b = ['0\n', '1\n', '<2>\n', '<3>\n', '4\n', '5\n', '7\n', '8\n',
- '11\n', '12\n', '<13>\n', '14\n', '15\n', 'A\n', 'B\n', 'C\n',
- '16\n', '17\n',]
- patch = ['15a\n', 'A\n', 'B\n', 'C\n', '.\n', '13c\n', '<13>\n', '.\n',
- '9,10d\n', '6d\n', '2,3c\n', '<2>\n', '<3>\n', '.\n', '0a\n',
- '0\n', '.\n']
- patch_lines(file_a, patches_from_ed_script(patch))
- assert ''.join(file_b) == ''.join(file_a)
-
- assert len(merge_as_sets([])) == 0
- assert ''.join(merge_as_sets("abc", "cb")) == "abc"
-
-if __name__ == "__main__":
- test()
diff --git a/tests/test_debian_support.py b/tests/test_debian_support.py
new file mode 100755
index 0000000..29ddb96
--- /dev/null
+++ b/tests/test_debian_support.py
@@ -0,0 +1,182 @@
+#!/usr/bin/python
+
+# Copyright (C) 2005 Florian Weimer <fw at deneb.enyo.de>
+# Copyright (C) 2006-2007 James Westby <jw+debian at jameswestby.net>
+# Copyright (C) 2010 John Wright <jsw at debian.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+import sys
+import unittest
+
+sys.path.insert(0, '../lib/debian/')
+
+from debian_support import *
+
+
+class VersionTests(unittest.TestCase):
+ """Tests for AptPkgVersion and NativeVersion classes in debian_support"""
+
+ def _test_version(self, full_version, epoch, upstream, debian):
+ for cls in (AptPkgVersion, NativeVersion):
+ v = cls(full_version)
+ self.assertEqual(v.full_version, full_version,
+ "%s: full_version broken" % cls)
+ self.assertEqual(v.epoch, epoch, "%s: epoch broken" % cls)
+ self.assertEqual(v.upstream_version, upstream,
+ "%s: upstream_version broken" % cls)
+ self.assertEqual(v.debian_revision, debian,
+ "%s: debian_revision broken" % cls)
+
+ def testversions(self):
+ self._test_version('1:1.4.1-1', '1', '1.4.1', '1')
+ self._test_version('7.1.ds-1', None, '7.1.ds', '1')
+ self._test_version('10.11.1.3-2', None, '10.11.1.3', '2')
+ self._test_version('4.0.1.3.dfsg.1-2', None, '4.0.1.3.dfsg.1', '2')
+ self._test_version('0.4.23debian1', None, '0.4.23debian1', None)
+ self._test_version('1.2.10+cvs20060429-1', None,
+ '1.2.10+cvs20060429', '1')
+ self._test_version('0.2.0-1+b1', None, '0.2.0', '1+b1')
+ self._test_version('4.3.90.1svn-r21976-1', None,
+ '4.3.90.1svn-r21976', '1')
+ self._test_version('1.5+E-14', None, '1.5+E', '14')
+ self._test_version('20060611-0.0', None, '20060611', '0.0')
+ self._test_version('0.52.2-5.1', None, '0.52.2', '5.1')
+ self._test_version('7.0-035+1', None, '7.0', '035+1')
+ self._test_version('1.1.0+cvs20060620-1+2.6.15-8', None,
+ '1.1.0+cvs20060620-1+2.6.15', '8')
+ self._test_version('1.1.0+cvs20060620-1+1.0', None,
+ '1.1.0+cvs20060620', '1+1.0')
+ self._test_version('4.2.0a+stable-2sarge1', None, '4.2.0a+stable',
+ '2sarge1')
+ self._test_version('1.8RC4b', None, '1.8RC4b', None)
+ self._test_version('0.9~rc1-1', None, '0.9~rc1', '1')
+ self._test_version('2:1.0.4+svn26-1ubuntu1', '2', '1.0.4+svn26',
+ '1ubuntu1')
+ self._test_version('2:1.0.4~rc2-1', '2', '1.0.4~rc2', '1')
+
+ def test_version_updating(self):
+ for cls in (AptPkgVersion, NativeVersion):
+ v = cls('1:1.4.1-1')
+
+ v.debian_version = '2'
+ self.assertEqual(v.debian_version, '2')
+ self.assertEqual(v.full_version, '1:1.4.1-2')
+
+ v.upstream_version = '1.4.2'
+ self.assertEqual(v.upstream_version, '1.4.2')
+ self.assertEqual(v.full_version, '1:1.4.2-2')
+
+ v.epoch = '2'
+ self.assertEqual(v.epoch, '2')
+ self.assertEqual(v.full_version, '2:1.4.2-2')
+
+ self.assertEqual(str(v), v.full_version)
+
+ v.full_version = '1:1.4.1-1'
+ self.assertEqual(v.full_version, '1:1.4.1-1')
+ self.assertEqual(v.epoch, '1')
+ self.assertEqual(v.upstream_version, '1.4.1')
+ self.assertEqual(v.debian_version, '1')
+
+ @staticmethod
+ def _get_truth_fn(cmp_oper):
+ if cmp_oper == "<":
+ return lambda a, b: a < b
+ elif cmp_oper == "<=":
+ return lambda a, b: a <= b
+ elif cmp_oper == "==":
+ return lambda a, b: a == b
+ elif cmp_oper == ">=":
+ return lambda a, b: a >= b
+ elif cmp_oper == ">":
+ return lambda a, b: a > b
+ else:
+ raise ValueError("invalid operator %s" % cmp_oper)
+
+ def _test_comparison(self, v1_str, cmp_oper, v2_str):
+ """Test comparison against all combinations of Version classes
+
+ This is does the real work for test_comparisons.
+ """
+
+ for (cls1, cls2) in [(AptPkgVersion, AptPkgVersion),
+ (AptPkgVersion, NativeVersion),
+ (NativeVersion, AptPkgVersion),
+ (NativeVersion, NativeVersion),
+ (str, AptPkgVersion), (AptPkgVersion, str),
+ (str, NativeVersion), (NativeVersion, str)]:
+ v1 = cls1(v1_str)
+ v2 = cls2(v2_str)
+ truth_fn = self._get_truth_fn(cmp_oper)
+ self.failUnless(truth_fn(v1, v2) == True,
+ "%r %s %r != True" % (v1, cmp_oper, v2))
+
+ def test_comparisons(self):
+ """Test comparison against all combinations of Version classes"""
+
+ self._test_comparison('0', '<', 'a')
+ self._test_comparison('1.0', '<', '1.1')
+ self._test_comparison('1.2', '<', '1.11')
+ self._test_comparison('1.0-0.1', '<', '1.1')
+ self._test_comparison('1.0-0.1', '<', '1.0-1')
+ self._test_comparison('1.0', '==', '1.0')
+ self._test_comparison('1.0-0.1', '==', '1.0-0.1')
+ self._test_comparison('1:1.0-0.1', '==', '1:1.0-0.1')
+ self._test_comparison('1:1.0', '==', '1:1.0')
+ self._test_comparison('1.0-0.1', '<', '1.0-1')
+ self._test_comparison('1.0final-5sarge1', '>', '1.0final-5')
+ self._test_comparison('1.0final-5', '>', '1.0a7-2')
+ self._test_comparison('0.9.2-5', '<',
+ '0.9.2+cvs.1.0.dev.2004.07.28-1.5')
+ self._test_comparison('1:500', '<', '1:5000')
+ self._test_comparison('100:500', '>', '11:5000')
+ self._test_comparison('1.0.4-2', '>', '1.0pre7-2')
+ self._test_comparison('1.5~rc1', '<', '1.5')
+ self._test_comparison('1.5~rc1', '<', '1.5+b1')
+ self._test_comparison('1.5~rc1', '<', '1.5~rc2')
+ self._test_comparison('1.5~rc1', '>', '1.5~dev0')
+
+
+class ReleaseTests(unittest.TestCase):
+ """Tests for debian_support.Release"""
+
+ def test_comparison(self):
+ self.assert_(intern_release('sarge') < intern_release('etch'))
+
+
+class HelperRoutineTests(unittest.TestCase):
+ """Tests for various debian_support helper routines"""
+
+ def test_read_lines_sha1(self):
+ self.assertEqual(read_lines_sha1([]),
+ 'da39a3ee5e6b4b0d3255bfef95601890afd80709')
+ self.assertEqual(read_lines_sha1(['1\n', '23\n']),
+ '14293c9bd646a15dc656eaf8fba95124020dfada')
+
+ def test_patch_lines(self):
+ file_a = map(lambda x: "%d\n" % x, range(1, 18))
+ file_b = ['0\n', '1\n', '<2>\n', '<3>\n', '4\n', '5\n', '7\n', '8\n',
+ '11\n', '12\n', '<13>\n', '14\n', '15\n', 'A\n', 'B\n',
+ 'C\n', '16\n', '17\n',]
+ patch = ['15a\n', 'A\n', 'B\n', 'C\n', '.\n', '13c\n', '<13>\n', '.\n',
+ '9,10d\n', '6d\n', '2,3c\n', '<2>\n', '<3>\n', '.\n', '0a\n',
+ '0\n', '.\n']
+ patch_lines(file_a, patches_from_ed_script(patch))
+ self.assertEqual(''.join(file_b), ''.join(file_a))
+
+
+if __name__ == "__main__":
+ unittest.main()
--
1.6.3.3
More information about the pkg-python-debian-commits
mailing list