From 800a9d8bc3d6805dd297e65c8d32efc74a1329b3 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 10 Apr 2012 00:45:20 +0200 Subject: wafsamba/bundled: Fix typo in tuplize_version. Autobuild-User: Jelmer Vernooij Autobuild-Date: Tue Apr 10 02:21:39 CEST 2012 on sn-devel-104 --- buildtools/wafsamba/samba_bundled.py | 2 +- buildtools/wafsamba/tests/__init__.py | 1 + buildtools/wafsamba/tests/test_bundled.py | 27 +++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 buildtools/wafsamba/tests/test_bundled.py (limited to 'buildtools') diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py index 6df7454264..c5b4022297 100644 --- a/buildtools/wafsamba/samba_bundled.py +++ b/buildtools/wafsamba/samba_bundled.py @@ -209,7 +209,7 @@ def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0', return False -def tuplize_version(version_string): +def tuplize_version(version): return tuple([int(x) for x in version.split(".")]) @runonce diff --git a/buildtools/wafsamba/tests/__init__.py b/buildtools/wafsamba/tests/__init__.py index c9f2fb64d7..ae27418aa7 100644 --- a/buildtools/wafsamba/tests/__init__.py +++ b/buildtools/wafsamba/tests/__init__.py @@ -24,6 +24,7 @@ from unittest import ( def test_suite(): names = [ 'abi', + 'bundled', 'utils', ] module_names = ['wafsamba.tests.test_' + name for name in names] diff --git a/buildtools/wafsamba/tests/test_bundled.py b/buildtools/wafsamba/tests/test_bundled.py new file mode 100644 index 0000000000..c5f0db63cb --- /dev/null +++ b/buildtools/wafsamba/tests/test_bundled.py @@ -0,0 +1,27 @@ +# Copyright (C) 2012 Jelmer Vernooij + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. + +# You should have received a copy of the GNU Lesser General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +from wafsamba.tests import TestCase + +from wafsamba.samba_bundled import ( + tuplize_version, + ) + + +class TuplizeVersionTests(TestCase): + + def test_simple(self): + self.assertEquals((1, 2, 10), tuplize_version("1.2.10")) -- cgit