[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  800a9d8 wafsamba/bundled: Fix typo in tuplize_version.
      from  7cf7890 wafsamba: Parse Python versions as integers separated by dots.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 800a9d8bc3d6805dd297e65c8d32efc74a1329b3
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Apr 10 00:45:20 2012 +0200

    wafsamba/bundled: Fix typo in tuplize_version.
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Tue Apr 10 02:21:39 CEST 2012 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 buildtools/wafsamba/samba_bundled.py               |    2 +-
 buildtools/wafsamba/tests/__init__.py              |    1 +
 .../tests/{__init__.py => test_bundled.py}         |   23 +++++++-------------
 3 files changed, 10 insertions(+), 16 deletions(-)
 copy buildtools/wafsamba/tests/{__init__.py => test_bundled.py} (67%)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py
index 6df7454..c5b4022 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 c9f2fb6..ae27418 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/__init__.py b/buildtools/wafsamba/tests/test_bundled.py
similarity index 67%
copy from buildtools/wafsamba/tests/__init__.py
copy to buildtools/wafsamba/tests/test_bundled.py
index c9f2fb6..c5f0db6 100644
--- a/buildtools/wafsamba/tests/__init__.py
+++ b/buildtools/wafsamba/tests/test_bundled.py
@@ -14,21 +14,14 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-"""Tests for wafsamba."""
+from wafsamba.tests import TestCase
 
-from unittest import (
-    TestCase,
-    TestLoader,
+from wafsamba.samba_bundled import (
+    tuplize_version,
     )
 
-def test_suite():
-    names = [
-        'abi',
-        'utils',
-        ]
-    module_names = ['wafsamba.tests.test_' + name for name in names]
-    loader = TestLoader()
-    result = loader.suiteClass()
-    suite = loader.loadTestsFromNames(module_names)
-    result.addTests(suite)
-    return result
+
+class TuplizeVersionTests(TestCase):
+
+    def test_simple(self):
+        self.assertEquals((1, 2, 10), tuplize_version("1.2.10"))


-- 
Samba Shared Repository