2.5 test fix

3 files changed, 19 insertions, 4 deletions

diff --git a/__pkginfo__.py b/__pkginfo__.py
index 99125c5..c9fc2ab 100644
--- a/__pkginfo__.py
+++ b/__pkginfo__.py
@@ -53,6 +53,6 @@ subpackage_master = True
 scripts = ('bin/pytest',)
 from os.path import join
 include_dirs = [join('test', 'data')]
-pyversions = ['2.3', '2.4']
+pyversions = ['2.3', '2.4', '2.5']
 debian_maintainer = 'Alexandre Fayolle'
 debian_maintainer_email = 'afayolle@debian.org'
diff --git a/test/unittest_configuration.py b/test/unittest_configuration.py
index 95cbadf..0f83036 100644
--- a/test/unittest_configuration.py
+++ b/test/unittest_configuration.py
@@ -155,7 +155,24 @@ named=key:val
         # it is not unlikely some optik/optparse versions do print -v<string>
         # so accept both
         help = help.replace(' -v <string>, ', ' -v<string>, ')
-        if version_info >= (2, 4):
+        if version_info >= (2, 5):
+            self.assertLinesEquals(help, """Usage: Just do it ! (tm)
+
+Options:
+  -h, --help            show this help message and exit
+  --dothis=<y or n>     
+  -v<string>, --value=<string>
+  --multiple=<comma separated values>
+                        you can also document the option [current: none]
+  --number=<int>        
+  --choice=<yo|ye>      
+  --multiple-choice=<yo|ye>
+  --named=<key=val>     
+
+  Bonus:
+    a nice additional help
+""".strip())
+        elif version_info >= (2, 4):
             self.assertLinesEquals(help, """usage: Just do it ! (tm)
 
 options:
diff --git a/test/unittest_textutils.py b/test/unittest_textutils.py
index b344ca6..855585d 100644
--- a/test/unittest_textutils.py
+++ b/test/unittest_textutils.py
@@ -6,8 +6,6 @@ squeleton generated by /home/syt/cvs_work/logilab/pyreverse/py2tests.py on Sep 0
 Some file / file path manipulation utilities
 
 """
-__revision__ = "$Id: unittest_textutils.py,v 1.8 2005-02-07 18:01:05 syt Exp $"
-
 import re
 from os import linesep