thomasvs - in flumotion/trunk: . flumotion/component flumotion/test

[flumotion-commit at lists.fluendo.com]

Author: thomasvs
Date: Tue Mar  6 15:51:03 2007
New Revision: 4589

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/component/feedcomponent010.py
   flumotion/trunk/flumotion/test/test_feedcomponent010.py
Log:
	* flumotion/component/feedcomponent010.py:
	* flumotion/test/test_feedcomponent010.py:
	  Set the keys we know we support to 0, the others to None.
	  Update the test for it.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Tue Mar  6 15:51:03 2007
@@ -1,5 +1,12 @@
 2007-03-06  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+	* flumotion/component/feedcomponent010.py:
+	* flumotion/test/test_feedcomponent010.py:
+	  Set the keys we know we support to 0, the others to None.
+	  Update the test for it.
+
+2007-03-06  Thomas Vander Stichele  <thomas at apestaart dot org>
+
 	* flumotion/component/base/admin_gtk.py:
 	* flumotion/component/feedcomponent010.py:
 	  Use None for uiState values to indicate "component has no support

Modified: flumotion/trunk/flumotion/component/feedcomponent010.py
==============================================================================
--- flumotion/trunk/flumotion/component/feedcomponent010.py	(original)
+++ flumotion/trunk/flumotion/component/feedcomponent010.py	Tue Mar  6 15:51:03 2007
@@ -110,16 +110,21 @@
 
         # these values can be set to None, which would mean
         # Unknown, not supported
+        # these are supported
         for key in (
             'bytesReadCurrent',      # bytes dropped over current connection
-            'buffersDroppedCurrent', # buffers dropped over current connection
             'bytesReadTotal',        # bytes dropped over all connections
-            'buffersDroppedTotal',   # buffers dropped over all connections
             'reconnects',            # number of connections made by this client
             'lastConnect',           # last client connection, in epoch seconds
             'lastDisconnect',        # last client disconnect, in epoch seconds
             'lastActivity',          # last time client read or connected
             ):
+            self.uiState.addKey(key, 0)
+        # these are possibly unsupported
+        for key in (
+            'buffersDroppedCurrent', # buffers dropped over current connection
+            'buffersDroppedTotal',   # buffers dropped over all connections
+            ):
             self.uiState.addKey(key, None)
 
         # internal state allowing us to track global numbers

Modified: flumotion/trunk/flumotion/test/test_feedcomponent010.py
==============================================================================
--- flumotion/trunk/flumotion/test/test_feedcomponent010.py	(original)
+++ flumotion/trunk/flumotion/test/test_feedcomponent010.py	Tue Mar  6 15:51:03 2007
@@ -49,7 +49,7 @@
         c = self.feeder.clientConnected(clientId, 3)
 
         # verify some stuff
-        self.clientAssertStats(c, 0, 0, 0, 0, 1)
+        self.clientAssertStats(c, 0, None, 0, None, 1)
 
         # read 10 bytes, drop 1 buffer
         c.setStats((10, None, None, None, time.time(), 1))