[Jython-checkins] SF.net SVN: jython:[5674] branches/newstyle-java-types/Lib/test/ test_cmd_line.py

[<cg...@us...>]

Revision: 5674
          http://jython.svn.sourceforge.net/jython/?rev=5674&view=rev
Author:   cgroves
Date:     2008-12-02 07:46:14 +0000 (Tue, 02 Dec 2008)

Log Message:
-----------
Better error message for a bad version string, use the actual banner for checking

Modified Paths:
--------------
    branches/newstyle-java-types/Lib/test/test_cmd_line.py

Modified: branches/newstyle-java-types/Lib/test/test_cmd_line.py
===================================================================
--- branches/newstyle-java-types/Lib/test/test_cmd_line.py	2008-12-02 05:23:26 UTC (rev 5673)
+++ branches/newstyle-java-types/Lib/test/test_cmd_line.py	2008-12-02 07:46:14 UTC (rev 5674)
@@ -45,8 +45,11 @@
         self.assertTrue('usage' in self.start_python('-h'))
 
     def test_version(self):
-        version = 'Jython %d.%d' % sys.version_info[:2]
-        self.assertTrue(self.start_python('-V').startswith(version))
+        from org.python.util import InteractiveConsole
+        expected = InteractiveConsole.getDefaultBanner()
+        reported = self.start_python('-V')
+        self.assertTrue(reported.startswith(expected),
+                "-V should start with '%s' but it printed '%s'" % (expected, reported))
 
 def test_main():
     test.test_support.run_unittest(CmdLineTest)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.