[vadm] r66707 - in vadm/dist/vadm: . test

[hpk at codespeak.net]

Author: hpk
Date: Thu Jul 30 21:43:06 2009
New Revision: 66707

Modified:
   vadm/dist/vadm/cmdline.py
   vadm/dist/vadm/test/test_commands.py
Log:
some test fixes to be ignorant of py lib version 


Modified: vadm/dist/vadm/cmdline.py
==============================================================================
--- vadm/dist/vadm/cmdline.py	(original)
+++ vadm/dist/vadm/cmdline.py	Thu Jul 30 21:43:06 2009
@@ -164,10 +164,9 @@
         """ this produces a list of all commands together with
             their abbreviations. 
         """
-        self.log.user("version: %s" %(vadm.__package__.version))
-        self.log.user("author: %s <%s>" %(vadm.__package__.author, 
-                                  vadm.__package__.author_email))
-        self.log.user("website: %s" %(vadm.__package__.url,))
+        self.log.user("version: %s" %(vadm.__version__))
+        self.log.user("author: holger krekel <holger at merlinux eu>")
+        self.log.user("website: http://codespeak.net/vadm",)
         
 class cmd_help(Command):
     """ display usage and help. """

Modified: vadm/dist/vadm/test/test_commands.py
==============================================================================
--- vadm/dist/vadm/test/test_commands.py	(original)
+++ vadm/dist/vadm/test/test_commands.py	Thu Jul 30 21:43:06 2009
@@ -13,9 +13,9 @@
         self.testlog.poplog("user")
         self.session.cmd('version', )
         txt = self.testlog.poplog("user")
-        assert txt.find(vadm.__package__.version) != -1
-        assert txt.find(vadm.__package__.author) != -1
-        assert txt.find(vadm.__package__.author_email) != -1
+        assert txt.find(vadm.__version__) != -1
+        #assert txt.find(vadm.__pkg__.author) != -1
+        #assert txt.find(vadm.__pkg__.author_email) != -1
 
     def test_commit_nothing(self):
         self.session.cmd('commit', '-m', 'x', self.systemroot)