Merge lp:~alecu/ubuntu-sso-client/silence-dbus-logger into lp:ubuntu-sso-client

[Alejandro J. Cura]

Silence warnings printed by dbus on the test run (LP: #912920)

Silence warnings printed by dbus on the test run (LP: #912920)

[Natalia Bidart (nataliabidart)]

Awesome is little next to this branch.

review: Approve

[dobey (dobey)]

I wonder if we should put this in ubuntuone-dev-tools instead, inside the dbus test case there. Then it would fix the issue for all our projects, and we wouldn't have to copy this code to all of them. :)

[Alejandro J. Cura (alecu)]

Happy new year, nessita!

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'ubuntu_sso/utils/tests/test_txsecrets.py'
--- ubuntu_sso/utils/tests/test_txsecrets.py	2011-11-21 15:31:53 +0000
+++ ubuntu_sso/utils/tests/test_txsecrets.py	2012-01-06 21:07:24 +0000
@@ -17,6 +17,7 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 """Tests for txkeyring."""
 
+import logging
 import uuid
 
 import dbus.service
@@ -389,6 +390,19 @@
     return base + "/" + random
 
 
+class TextFilter(logging.Filter):
+    """Prevents the logging of messages containing a given text."""
+
+    def __init__(self, *args):
+        """Initialize this filter."""
+        super(TextFilter, self).__init__()
+        self.filtered_strings = args
+
+    def filter(self, record):
+        """See if we need to filter a given log record."""
+        return not any(s in record.msg for s in self.filtered_strings)
+
+
 class BaseTestCase(DBusTestCase):
     """Base class for DBus tests."""
     timeout = 10
@@ -401,6 +415,14 @@
         self.mock_service = self.dbus_publish(txsecrets.SECRETS_SERVICE,
                                               self.secret_service_class)
         self.secretservice = txsecrets.SecretService()
+        self.silence_dbus_logging()
+
+    def silence_dbus_logging(self):
+        """Silence the warnings printed by dbus that pollute test results."""
+        logger = logging.getLogger('dbus.connection')
+        logfilter = TextFilter("Unable to set arguments")
+        logger.addFilter(logfilter)
+        self.addCleanup(logger.removeFilter, logfilter)
 
     def dbus_publish(self, object_path, object_class, *args, **kwargs):
         """Create an object and publish it on the bus."""