[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone4-368-g700ab82

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit 3caca8e7c153cb353f61985bcc8961c317c1d64e
Merge: 6b6064be9ffabbc9d907d807af9711a97b124088 f6ced38e20321acca91f6ad27630ea11e0ea4cd3
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Wed Nov 26 17:11:13 2008 +0100

    Merge commit 'origin/stabilization/milestone4'

diff --combined tests/test.py
index 2d5109e,99782dd..cb467ef
--- a/tests/test.py
+++ b/tests/test.py
@@@ -131,26 -131,31 +131,31 @@@ class TestTest(unittest.TestCase)
          yield True
  
  #=========================================================================#
+ def testDbusType( value, type_ ):
+ #=========================================================================#
+         assert type( value ) == type_, "expected %s type, got '%s' instead" % ( type_, type( value ) )
+ 
+ #=========================================================================#
  def testDbusValueIsInteger( value ):
  #=========================================================================#
          assert type( value ) == dbus.Int16 or \
                 type( value ) == dbus.Int32 or \
-                type( value ) == dbus.Int64, "value type not an integer"
+                type( value ) == dbus.Int64, "expected integer value type, got '%s' instead" % type( value )
  
  #=========================================================================#
  def testDbusDictionaryWithStringValues( result ):
  #=========================================================================#
-     assert type( result ) is dbus.Dictionary, "wrong type returned"
+     assert type( result ) is dbus.Dictionary, "expected dictionary type, got '%s' instead" % type( result )
      for key, value in result.items():
-         assert type( key ) == dbus.String, "key type in dictionary not a string"
-         assert type( value ) == dbus.String, "value type in dictionary not a string"
+         assert type( key ) == dbus.String, "key type in dictionary not a string, got '%s' instead" % type( key )
+         assert type( value ) == dbus.String, "value type in dictionary not a string, got '%s' instead" % type( value )
  
  #=========================================================================#
  def testDbusDictionaryWithIntegerValues( result ):
  #=========================================================================#
-     assert type( result ) is dbus.Dictionary, "wrong type returned"
+     assert type( result ) is dbus.Dictionary, "expected dictionary type, got '%s' instead" % type( result )
      for key, value in result.items():
-         assert type( key ) == dbus.String, "key type in dictionary not a string"
+         assert type( key ) == dbus.String, "key type in dictionary not a string, got '%s' instead" % type( key )
          testDBusValueIsInteger( value )
  
  #=========================================================================#
@@@ -192,7 -197,7 +197,7 @@@ if __name__ == '__main__'
  #=========================================================================#
      # This list all the modules containing the tests we want to run
      # TODO: provide command line arguments like in Mikey ogsmd test script
 -    modules = ['test', 'opreferencesd', 'sim', 'opimd', 'ogsmd2']
 +    modules = ['test', 'opreferencesd', 'sim', 'opimd', 'ogsmd2', 'oevents']
  
      for module in modules:
          module = __import__(module)

-- 
FSO frameworkd Debian packaging