Merge lp:~nataliabidart/magicicada-gui/use-initial-on-gui into lp:magicicada-gui

[Natalia Bidart]

Volumes and metadata buttons are enabled when initial_data_ready callback is fired (LP: #612194).

[lp:~nataliabidart/magicicada-gui/use-initial-on-gui]

76. By Natalia Bidart on 2010-09-12

Improved arguments passed to trial, so we can either pass a
file|package|module|TestCase|testmethod] or nothing to run the whole suite.

77. By Natalia Bidart on 2010-09-12

Minor tweaks.

[Facundo Batista (facundo)]

You added options (commented out, but you still added them) to pylintrc that are no longer valid, like "enabled-cat".

Please, fix that.

The rest is fine :)

review: Needs Fixing

[lp:~nataliabidart/magicicada-gui/use-initial-on-gui]

78. By Natalia Bidart on 2010-09-14

Removed {enable,disable}-cat since they are ignored.

[Natalia Bidart (nataliabidart)]

> You added options (commented out, but you still added them) to pylintrc that
> are no longer valid, like "enabled-cat".
>
> Please, fix that.
>
> The rest is fine :)

Fixed!

[Facundo Batista (facundo)]

:)

review: Approve

=== modified file 'magicicada/__init__.py'
--- magicicada/__init__.py	2010-08-21 18:54:31 +0000
+++ magicicada/__init__.py	2010-09-14 21:39:47 +0000
@@ -31,9 +31,9 @@
 # this shouldn't crash if not found as it is simply used for bug reporting
 try:
     import LaunchpadIntegration
-    launchpad_available = True
+    LAUNCHPAD_AVAILABLE = True
 except ImportError:
-    launchpad_available = False
+    LAUNCHPAD_AVAILABLE = False
 
 from twisted.internet import gtk2reactor  # for gtk-2.0
 gtk2reactor.install()
@@ -47,16 +47,11 @@
 UBUNTU_ONE_ROOT = os.path.expanduser('~/Ubuntu One')
 
 # set up the logging for all the project
+# Instance of 'RootLogger' has no 'set_up' member
+# pylint: disable=E1103
 logger_helper.set_up()
 logger = logging.getLogger('magicicada.ui')
 
-DEBUG = os.getenv('DEBUG')
-if DEBUG:
-    console = logging.StreamHandler()
-    console.setLevel(logging.DEBUG)
-    logger.addHandler(console)
-
-
 # Instance of 'A' has no 'y' member
 # pylint: disable=E1101
 
@@ -81,7 +76,7 @@
         self.builder = get_builder('gui.glade')
         self.builder.connect_signals(self)
 
-        if launchpad_available:
+        if LAUNCHPAD_AVAILABLE:
             # for more information about LaunchpadIntegration:
             # wiki.ubuntu.com/UbuntuDevelopment/Internationalisation/Coding
             helpmenu = self.builder.get_object('helpMenu')
@@ -132,8 +127,8 @@
         icon_filename = get_data_file('media', 'logo-016.png')
         self._icon = gtk.gdk.pixbuf_new_from_file(icon_filename)
         self.status_icon.set_from_file(icon_filename)
-        for w in self.windows:
-            w.set_icon(self._icon)
+        for win in self.windows:
+            win.set_icon(self._icon)
 
         about_fname = get_data_file('media', 'logo-128.png')
         self.about_dialog.set_logo(gtk.gdk.pixbuf_new_from_file(about_fname))
@@ -149,6 +144,7 @@
         self.sd.content_queue_changed_callback = self.on_content_queue_changed
         self.sd.meta_queue_changed_callback = self.on_meta_queue_changed
         self.sd.on_metadata_ready_callback = self.on_metadata_ready
+        self.sd.on_initial_data_ready_callback = self.on_initial_data_ready
 
         self.widget_is_visible = lambda w: w.get_property('visible')
         self.widget_enabled = lambda w: self.widget_is_visible(w) and \
@@ -222,8 +218,8 @@
 
     def on_stop_clicked(self, widget, data=None):
         """Stop syncdaemon."""
-        for v in self.volumes:
-            v.set_sensitive(False)
+        for volume in self.volumes:
+            volume.set_sensitive(False)
         self.metadata.set_sensitive(False)
 
         if self.widget_enabled(self.disconnect):
@@ -370,10 +366,6 @@
         self._activate_indicator(self.is_started)
         self.connect.set_sensitive(True)
 
-        for v in self.volumes:
-            v.set_sensitive(True)
-        self.metadata.set_sensitive(True)
-
         self._update_queues_and_status(self.sd.current_state)
 
     @log(logger)
@@ -489,6 +481,13 @@
             text = '\n'.join('%s: %s' % i for i in metadata.iteritems())
         dialog.view.get_buffer().set_text(text)
 
+    @log(logger)
+    def on_initial_data_ready(self):
+        """Initial data is now available in syncdaemon."""
+        for volume in self.volumes:
+            volume.set_sensitive(True)
+        self.metadata.set_sensitive(True)
+
     # custom
 
     def _start_loading(self, what):

=== modified file 'magicicada/logger.py'
--- magicicada/logger.py	2010-08-18 21:17:20 +0000
+++ magicicada/logger.py	2010-09-14 21:39:47 +0000
@@ -68,5 +68,10 @@
     handler.setFormatter(formatter)
     logger.setLevel(logging.DEBUG)
 
+    if os.getenv('DEBUG'):
+        console = logging.StreamHandler()
+        console.setLevel(logging.DEBUG)
+        logger.addHandler(console)
+
     # hook the exception handler
     sys.excepthook = exception_handler

=== modified file 'magicicada/syncdaemon.py'
--- magicicada/syncdaemon.py	2010-09-02 18:23:02 +0000
+++ magicicada/syncdaemon.py	2010-09-14 21:39:47 +0000
@@ -274,6 +274,8 @@
             self._get_mq_data()
 
             if self._must_poll_mq:
+                # Module 'twisted.internet.reactor' has no 'callLater' member
+                # pylint: disable=E1101
                 self._mqcaller = reactor.callLater(self._mq_poll_time,
                                                    self._check_mq)
 
@@ -304,4 +306,6 @@
             raise ValueError("Missing the mandatory cback for get_metadata.")
 
         d = self.dbus.get_metadata(os.path.realpath(path))
+        # self.on_metadata_ready_callback is not callable
+        # pylint: disable=E1102
         d.addCallback(lambda resp: self.on_metadata_ready_callback(path, resp))

=== modified file 'magicicada/tests/test_dbusiface.py'
--- magicicada/tests/test_dbusiface.py	2010-08-23 16:48:07 +0000
+++ magicicada/tests/test_dbusiface.py	2010-09-14 21:39:47 +0000
@@ -263,13 +263,13 @@
         self.dbus._on_name_owner_changed("foo", "bar", "baz")
         self.get_msd_called(None)
 
-    def test_name_owner_changed_yes_syncdaemon_TF(self):
+    def test_name_owner_changed_yes_syncdaemon_true_false(self):
         """Test name owner changed callback."""
         self.dbus._on_name_owner_changed("com.ubuntuone.SyncDaemon", "T", "")
         rcv, = self.get_msd_called("on_sd_name_owner_changed")
         self.assertEqual(rcv, False)
 
-    def test_name_owner_changed_yes_syncdaemon_FT(self):
+    def test_name_owner_changed_yes_syncdaemon_false_true(self):
         """Test name owner changed callback."""
         self.dbus._on_name_owner_changed("com.ubuntuone.SyncDaemon", "", "T")
         rcv, = self.get_msd_called("on_sd_name_owner_changed")
@@ -371,7 +371,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_GetPublicFiles_old(self):
+    def test_getpublicfiles_old(self):
         """Test meta with GetPublicFiles."""
         cmd = 'GetPublicFiles'
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -383,7 +383,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_AccountInquiry_old(self):
+    def test_accountinquiry_old(self):
         """Test meta with AccountInquiry."""
         cmd = 'AccountInquiry'
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -395,7 +395,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_FreeSpaceInquiry_old(self):
+    def test_freespaceinquiry_old(self):
         """Test meta with FreeSpaceInquiry."""
         cmd = 'FreeSpaceInquiry'
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -407,7 +407,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_ListShares_old(self):
+    def test_listshares_old(self):
         """Test meta with ListShares."""
         cmd = 'ListShares'
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -419,7 +419,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_ListVolumes_old(self):
+    def test_listvolumes_old(self):
         """Test meta with ListVolumes."""
         cmd = 'ListVolumes'
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -431,7 +431,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_Query_old(self):
+    def test_query_old(self):
         """Test meta with Query."""
         cmd = 'Query'
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -443,7 +443,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_ListDir_old(self):
+    def test_listdir_old(self):
         """Test meta with ListDir."""
         cmd = 'ListDir(share_id=a, node_id=b, server_hash=c)'
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -455,7 +455,7 @@
         self.assertEqual(data.node, 'b')
 
     @defer.inlineCallbacks
-    def test_MakeDir_old(self):
+    def test_makedir_old(self):
         """Test meta with MakeDir."""
         cmd = 'MakeDir(share_id=a, parent_id=b, name=c, marker=d)'
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -467,7 +467,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_MakeFile_old(self):
+    def test_makefile_old(self):
         """Test meta with MakeFile."""
         cmd = 'MakeFile(share_id=a, parent_id=b, name=c, marker=d)'
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -479,7 +479,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_Unlink_old(self):
+    def test_unlink_old(self):
         """Test meta with Unlink."""
         cmd = 'Unlink(share_id=a, node_id=b, server_hash=c)'
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -491,7 +491,7 @@
         self.assertEqual(data.node, 'b')
 
     @defer.inlineCallbacks
-    def test_Move_old(self):
+    def test_move_old(self):
         """Test meta with Move."""
         cmd = 'Move(share_id=a, node_id=b, old_parent_id=c, '\
               'new_parent_id=d, new_name=e)'
@@ -504,7 +504,7 @@
         self.assertEqual(data.node, 'b')
 
     @defer.inlineCallbacks
-    def test_ChangePublicAccess_old(self):
+    def test_changepublicaccess_old(self):
         """Test meta with ChangePublicAccess."""
         cmd = 'ChangePublicAccess'
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -516,7 +516,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_AnswerShare_old(self):
+    def test_answershare_old(self):
         """Test meta with AnswerShare."""
         cmd = 'AnswerShare'
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -528,7 +528,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_GetPublicFiles_dict(self):
+    def test_getpublicfiles_dict(self):
         """Test meta with GetPublicFiles."""
         cmd = ('GetPublicFiles', {})
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -540,7 +540,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_AccountInquiry_dict(self):
+    def test_accountinquiry_dict(self):
         """Test meta with AccountInquiry."""
         cmd = ('AccountInquiry', {})
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -552,7 +552,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_FreeSpaceInquiry_dict(self):
+    def test_freespaceinquiry_dict(self):
         """Test meta with FreeSpaceInquiry."""
         cmd = ('FreeSpaceInquiry', {})
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -564,7 +564,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_ListShares_dict(self):
+    def test_listshares_dict(self):
         """Test meta with ListShares."""
         cmd = ('ListShares', {})
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -576,7 +576,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_ListVolumes_dict(self):
+    def test_listvolumes_dict(self):
         """Test meta with ListVolumes."""
         cmd = ('ListVolumes', {})
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -588,7 +588,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_Query_dict(self):
+    def test_query_dict(self):
         """Test meta with Query."""
         cmd = ('Query', {})
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -600,7 +600,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_ListDir_dict(self):
+    def test_listdir_dict(self):
         """Test meta with ListDir."""
         cmd = ('ListDir', dict(share_id='a', node_id='b',
                                server_hash='c', path='d'))
@@ -613,7 +613,7 @@
         self.assertEqual(data.node, 'b')
 
     @defer.inlineCallbacks
-    def test_MakeDir_dict(self):
+    def test_makedir_dict(self):
         """Test meta with MakeDir."""
         cmd = ('MakeDir', dict(share_id='a', parent_id='b',
                                name='c', marker='d'))
@@ -626,7 +626,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_MakeFile_dict(self):
+    def test_makefile_dict(self):
         """Test meta with MakeFile."""
         cmd = ('MakeFile', dict(share_id='a', parent_id='b',
                                 name='c', marker='d'))
@@ -639,7 +639,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_Unlink_dict(self):
+    def test_unlink_dict(self):
         """Test meta with Unlink."""
         cmd = ('Unlink', dict(share_id='a', node_id='b',
                               server_hash='c', path='d'))
@@ -652,7 +652,7 @@
         self.assertEqual(data.node, 'b')
 
     @defer.inlineCallbacks
-    def test_Move_dict(self):
+    def test_move_dict(self):
         """Test meta with Move."""
         cmd = ('Move', dict(share_id='a', node_id='b', old_parent_id='c',
                             new_parent_id='d', new_name='e', path='f'))
@@ -665,7 +665,7 @@
         self.assertEqual(data.node, 'b')
 
     @defer.inlineCallbacks
-    def test_ChangePublicAccess_dict(self):
+    def test_changepublicaccess_dict(self):
         """Test meta with ChangePublicAccess."""
         cmd = ('ChangePublicAccess', {})
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -677,7 +677,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_AnswerShare_dict(self):
+    def test_answershare_dict(self):
         """Test meta with AnswerShare."""
         cmd = ('AnswerShare', {})
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -1052,7 +1052,7 @@
         self.assertTrue(self.handler.check_info("Received Name Owner changed"))
         self.assertTrue(self.handler.check_debug("Name Owner data: u'' u'T'"))
 
-    def test_name_owner_changed_yes_syncdaemon_TF(self):
+    def test_name_owner_changed_yes_syncdaemon_true_false(self):
         """Test name owner changed callback, SD value bad."""
         self.dbus._on_name_owner_changed("com.ubuntuone.SyncDaemon", "F", "T")
         self.assertTrue(self.handler.check_info("Received Name Owner changed"))

=== modified file 'magicicada/tests/test_magicicada.py'
--- magicicada/tests/test_magicicada.py	2010-08-21 16:58:46 +0000
+++ magicicada/tests/test_magicicada.py	2010-09-14 21:39:47 +0000
@@ -101,8 +101,12 @@
         self.content_queue_changed_callback = NO_OP
         self.meta_queue_changed_callback = NO_OP
         self.on_metadata_ready_callback = None  # mandatory
+        self.on_initial_data_ready_callback = NO_OP
         self.shutdown = NO_OP
 
+        # Lambda may not be necessary
+        # pylint: disable=W0108
+
         self.start = lambda: setattr(self.current_state, 'is_started', True)
         self.quit = lambda: setattr(self.current_state, 'is_started', False)
         self.connect = lambda: setattr(self.current_state,
@@ -155,30 +159,6 @@
         else:
             return TestCase.__getattribute__(self, name)
 
-        if self._failed_test:
-            # no, I'm not raising a bool. pylint: disable=E0702
-            raise self._failed_test
-
-    def __getattribute__(self, name):
-        """Overwrite the assert methods with safer ones.
-
-        This way if a test called by gobject in the future fails, it
-        makes the whole test suite fail.
-        """
-        if name.startswith('assert') and hasattr(TestCase, name):
-
-            def proxy(*args, **kwargs):
-                """Function that will call the real assert."""
-                real_assert = getattr(TestCase, name)
-                try:
-                    real_assert(self, *args, **kwargs)
-                except Exception, e:
-                    self._failed_test = e
-                    raise
-            return proxy
-        else:
-            return TestCase.__getattribute__(self, name)
-
     def do_start(self):
         """Simulate that start fully happened."""
         self.ui.on_start_clicked(self.ui.start)
@@ -968,7 +948,7 @@
         s = super(_MagicicadaUIVolumeTestCase, self)
         s.assert_widget_availability(self.name, enabled)
 
-    def assert_sort_order_correct(self, column, i, expected_order):
+    def assert_sort_order_correct(self, column, idx, expected_order):
         """Check that sort order is correctly set."""
         msg0 = 'Store sort id must be %r (got %r instead).'
         msg1 = 'Store sort order must be %r (got %r instead).'
@@ -977,7 +957,7 @@
         actual_id, actual_order = self.volume_store.get_sort_column_id()
 
         # store sort column id and order
-        self.assertEqual(i, actual_id, msg0 % (i, actual_id))
+        self.assertEqual(idx, actual_id, msg0 % (idx, actual_id))
         self.assertEqual(expected_order, actual_order,
                          msg1 % (expected_order, actual_order))
 
@@ -1001,18 +981,27 @@
                              msg % (other_column.get_name(), 'off'))
 
     @skip_abstract_class
-    def test_volume_are_disabled_until_started(self):
-        """Folders and shares are disabled until online."""
+    def test_initial_data_ready_callback_connected(self):
+        """The callback 'on_initial_data_ready' is connected to SD."""
+        self.assertEqual(self.ui.sd.on_initial_data_ready_callback,
+                         self.ui.on_initial_data_ready,
+                         "on_initial_data_ready should be connected.")
+
+    @skip_abstract_class
+    def test_volume_are_disabled_until_initial_data_ready(self):
+        """Folders and shares are disabled until data ready."""
         # disabled at startup
         self.assert_widget_availability(enabled=False)
 
-        # enabled when started
-        self.do_start()
+        # enabled when initial data ready
+        self.ui.on_initial_data_ready()
         self.assert_widget_availability(enabled=True)
 
     @skip_abstract_class
     def test_volume_are_enabled_until_stopped(self):
         """Folders and shares are enabled until offline."""
+        self.ui.on_initial_data_ready()
+
         self.do_connect()
         self.assert_widget_availability(enabled=True)
 
@@ -1130,16 +1119,16 @@
     @skip_abstract_class
     def test_volume_sorting(self):
         """Test volume panel can be re-sorted."""
-        for i, col in enumerate(self.volume_view.get_columns()):
+        for idx, col in enumerate(self.volume_view.get_columns()):
             col.clicked()  # click on the column
-            self.assert_sort_order_correct(col, i, gtk.SORT_ASCENDING)
+            self.assert_sort_order_correct(col, idx, gtk.SORT_ASCENDING)
             self.assert_sort_indicator_correct(col)
 
             col.clicked()  # click on the column, sort order must change
-            self.assert_sort_order_correct(col, i, gtk.SORT_DESCENDING)
+            self.assert_sort_order_correct(col, idx, gtk.SORT_DESCENDING)
 
             col.clicked()  # click again, sort order must be the first one
-            self.assert_sort_order_correct(col, i, gtk.SORT_ASCENDING)
+            self.assert_sort_order_correct(col, idx, gtk.SORT_ASCENDING)
 
 
 class MagicicadaUIFoldersTestCase(_MagicicadaUIVolumeTestCase):
@@ -1266,17 +1255,19 @@
         msg = 'buffer content must be %s (got %s instead).'
         self.assertEqual(actual, expected, msg % (expected, actual))
 
-    def test_metadata_are_disabled_until_started(self):
-        """Metadata button is disabled until online."""
+    def test_metadata_are_disabled_until_initial_data_ready(self):
+        """Metadata button is disabled until initial data."""
         # disabled at startup
         self.assert_widget_availability(enabled=False)
 
-        # enabled when started
-        self.do_start()
+        # enabled when initial data ready
+        self.ui.on_initial_data_ready()
         self.assert_widget_availability(enabled=True)
 
     def test_metadata_are_enabled_until_stopped(self):
         """Metadata button is enabled until offline."""
+        self.ui.on_initial_data_ready()
+
         self.do_connect()
         self.assert_widget_availability(enabled=True)
 

=== modified file 'magicicada/tests/test_syncdaemon.py'
--- magicicada/tests/test_syncdaemon.py	2010-09-02 18:23:02 +0000
+++ magicicada/tests/test_syncdaemon.py	2010-09-14 21:39:47 +0000
@@ -32,6 +32,9 @@
 # It's ok to access private data in the test suite
 # pylint: disable=W0212
 
+# Lambda may not be necessary
+# pylint: disable=W0108
+
 
 class FakeDBusInterface(object):
     """Fake DBus Interface, for SD to not use dbus at all during tests."""
@@ -322,19 +325,19 @@
         self.sd.on_sd_content_queue_changed()
         self.assertEqual(called, [['foo']])
 
-    def test_CQ_state_nothing(self):
+    def test_cq_state_nothing(self):
         """Check the ContentQueue info, being nothing."""
         self.sd.dbus.get_content_queue = lambda: defer.succeed([])
         self.sd.on_sd_content_queue_changed()
         self.assertEqual(self.sd.content_queue, [])
 
-    def test_CQ_state_one(self):
+    def test_cq_state_one(self):
         """Check the ContentQueue info, being one."""
         self.sd.dbus.get_content_queue = lambda: defer.succeed(['foo'])
         self.sd.on_sd_content_queue_changed()
         self.assertEqual(self.sd.content_queue, ['foo'])
 
-    def test_CQ_state_two(self):
+    def test_cq_state_two(self):
         """Check the ContentQueue info, two."""
         self.sd.dbus.get_content_queue = lambda: defer.succeed(['foo', 'bar'])
         self.sd.on_sd_content_queue_changed()
@@ -526,6 +529,8 @@
 
     def test_mq_caller_is_reset_last_time(self):
         """When MQ is polled last time, the caller should be back to None."""
+        # Module 'twisted.internet.reactor' has no 'callLater' member
+        # pylint: disable=E1101
         self.sd._mqcaller = reactor.callLater(100, lambda: None)
         self.sd.current_state.set(name='QUEUE_MANAGER',
                                   queues='WORKING_ON_CONTENT')
@@ -550,6 +555,8 @@
                                              'WORKING_ON_CONTENT', 'connect')
 
                 # allow time to see if a mistaken call happens
+                # Module 'twisted.internet.reactor' has no 'callLater' member
+                # pylint: disable=E1101
                 reactor.callLater(.5, deferred.callback, True)
             elif len(calls) == 4:
                 pass    # last call after state changed
@@ -566,19 +573,19 @@
         deferred = defer.Deferred()
         return deferred
 
-    def test_MQ_state_nothing(self):
+    def test_mq_state_nothing(self):
         """Check the MetaQueue info, being nothing."""
         self.sd.dbus.get_meta_queue = lambda: defer.succeed([])
         self.sd._check_mq()
         self.assertEqual(self.sd.meta_queue, [])
 
-    def test_MQ_state_one(self):
+    def test_mq_state_one(self):
         """Check the MetaQueue info, being one."""
         self.sd.dbus.get_meta_queue = lambda: defer.succeed(['foo'])
         self.sd._check_mq()
         self.assertEqual(self.sd.meta_queue, ['foo'])
 
-    def test_MQ_state_two(self):
+    def test_mq_state_two(self):
         """Check the MetaQueue info, two."""
         self.sd.dbus.get_meta_queue = lambda: defer.succeed(['foo', 'bar'])
         self.sd._check_mq()

=== modified file 'pylintrc'
--- pylintrc	2010-08-23 16:06:20 +0000
+++ pylintrc	2010-09-14 21:39:47 +0000
@@ -1,16 +1,20 @@
 # lint Python modules using external checkers.
 #
-# This is the main checker controling the other ones and the reports
+# This is the main checker controlling the other ones and the reports
 # generation. It is itself both a raw checker and an astng checker in order
 # to:
 # * handle message activation / deactivation at the module level
-# * handle some basic but necessary stats data (number of classes, methods...)
+# * handle some basic but necessary stats'data (number of classes, methods...)
 #
 [MASTER]
 
 # Specify a configuration file.
 #rcfile=
 
+# Python code to execute, usually for sys.path manipulation such as
+# pygtk.require().
+#init-hook=
+
 # Profiled execution.
 profile=no
 
@@ -21,42 +25,37 @@
 # Pickle collected data for later comparisons.
 persistent=no
 
-# Set the cache size for astng objects.
-cache-size=500
-
 # List of plugins (as comma separated values of python modules names) to load,
 # usually to register additional checkers.
 load-plugins=
 
 
-[COMMANDS]
-
-# Display a help message for the given message id and exit. The value may be a
-# comma separated list of message ids.
-#help-msg=
-
-
 [MESSAGES CONTROL]
 
-# Enable only checker(s) with the given id(s). This option conflict with the
+# Enable only checker(s) with the given id(s). This option conflicts with the
 # disable-checker option
 #enable-checker=
 
-# Enable all checker(s) except those with the given id(s). This option conflict
-# with the disable-checker option
-disable-checker=typecheck,design,miscellaneous,similarities
-
-# Disable the message(s) with the given id(s) or categories
-disable=R,I,W0142,W0613,W0108
+# Enable all checker(s) except those with the given id(s). This option
+# conflicts with the enable-checker option
+#disable-checker=
+
+# Enable the message(s) with the given id(s).
+#enable=
+
+# Disable the message(s) with the given id(s).
+# W0142: Used * or ** magic
+# W0613: Unused argument 'yyy'
+disable=R,I,W0142,W0613
 
 
 [REPORTS]
 
-# set the output format. Available formats are text, parseable, colorized and
-# html
+# Set the output format. Available formats are text, parseable, colorized, msvs
+# (visual studio) and html
 output-format=colorized
 
-# Include messages id in output
+# Include message's id in output
 include-ids=yes
 
 # Put messages in a separate file for each module / package specified on the
@@ -64,12 +63,12 @@
 # written in a file name "pylint_global.[txt|html]".
 files-output=no
 
-# Tells wether to display a full report or only the messages
+# Tells whether to display a full report or only the messages
 reports=no
 
 # Python expression which should return a note less than 10 (10 is the highest
-# note).You have access to the variables errors warning, statement which
-# respectivly contain the number of errors / warnings messages and the total
+# note). You have access to the variables errors warning, statement which
+# respectively contain the number of errors / warnings messages and the total
 # number of statements analyzed. This is used by the global evaluation report
 # (R0004).
 evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
@@ -79,53 +78,56 @@
 comment=no
 
 # Enable the report(s) with the given id(s).
-enable-report=
+#enable-report=
 
 # Disable the report(s) with the given id(s).
 #disable-report=
 
 
+# try to find bugs in the code using type inference
+#
+[TYPECHECK]
+
+# Tells whether missing members accessed in mixin class should be ignored. A
+# mixin class is detected if its name ends with "mixin" (case insensitive).
+ignore-mixin-members=yes
+
+# List of classes names for which member attributes should not be checked
+# (useful for classes with attributes dynamically set).
+ignored-classes=
+
+# When zope mode is activated, add a predefined set of Zope acquired attributes
+# to generated-members.
+zope=no
+
+# List of members which are set dynamically and missed by pylint inference
+# system, and so shouldn't trigger E0201 when accessed.
+generated-members=REQUEST,acl_users,aq_parent
+
+
 # checks for
 # * unused variables / imports
 # * undefined variables
 # * redefinition of variable from builtins or from an outer scope
-# * use of variable before assigment
+# * use of variable before assignment
 #
 [VARIABLES]
 
-# Tells wether we should check for unused import in __init__ files.
+# Tells whether we should check for unused import in __init__ files.
 init-import=yes
 
 # A regular expression matching names used for dummy variables (i.e. not used).
-dummy-variables-rgx=dummy|ignored|cache|__
+dummy-variables-rgx=_|dummy
 
 # List of additional names supposed to be defined in builtins. Remember that
 # you should avoid to define new builtins when possible.
-additional-builtins=_
-
-
-# try to find bugs in the code using type inference
-#
-[TYPECHECK]
-
-# Tells wether missing members accessed in mixin class should be ignored. A
-# mixin class is detected if its name ends with "mixin" (case insensitive).
-ignore-mixin-members=yes
-
-# When zope mode is activated, consider the acquired-members option to ignore
-# access to some undefined attributes.
-#zope=yes
-
-# List of members which are usually get through zope's acquisition mecanism and
-# so shouldn't trigger E0201 when accessed (need zope=yes to be considered).
-# Also uses this to suppress false E1101 errors
-#acquired-members=REQUEST,acl_users,aq_parent,byName,providedBy,q,union,teamownerID,items,name,destroySelf,count,version,request,context
+additional-builtins=
 
 
 # checks for :
 # * doc strings
 # * modules / classes / functions / methods / arguments / variables name
-# * number of arguments, local variables, branchs, returns and statements in
+# * number of arguments, local variables, branches, returns and statements in
 # functions, methods
 # * required module attributes
 # * dangerous default values as arguments
@@ -133,7 +135,6 @@
 # * uses of the global statement
 #
 [BASIC]
-enable-basic=yes
 
 # Required attributes for module, separated by a comma
 required-attributes=
@@ -143,56 +144,86 @@
 no-docstring-rgx=(__.*__|setUp|tearDown)
 
 # Regular expression which should only match correct module names
-module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
+module-rgx=([a-z_][a-z0-9_]*)$
 
 # Regular expression which should only match correct module level names
-const-rgx=([a-z_][a-z0-9_]*|[A-Z_][A-Z0-9_]*)$
+const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
 
 # Regular expression which should only match correct class names
 class-rgx=[A-Z_][a-zA-Z0-9]+$
 
 # Regular expression which should only match correct function names
-function-rgx=[a-z_][a-z0-9_]*$
+function-rgx=[a-z_][a-z0-9_]{2,79}$
 
 # Regular expression which should only match correct method names
-method-rgx=[a-z_][a-zA-Z0-9_]*$
+method-rgx=([a-z_][a-z0-9_]{2,79}$|setUp|tearDown)
 
 # Regular expression which should only match correct instance attribute names
-attr-rgx=[a-z_][a-zA-Z0-9_]*$
+attr-rgx=[a-z_][a-z0-9_]{1,50}$
 
 # Regular expression which should only match correct argument names
-argument-rgx=[a-z_][a-zA-Z0-9_]{1,30}$
+argument-rgx=[a-z_][a-z0-9_]{1,30}$
 
 # Regular expression which should only match correct variable names
-# They are normally all lowercase, but when a constant, they are all uppercase.
-variable-rgx=([a-z_][a-z0-9_]*|[A-Z_][A-Z0-9_]*)$
+variable-rgx=[a-z_][a-z0-9_]{0,30}$
 
 # Regular expression which should only match correct list comprehension /
 # generator expression variable names
 inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
 
 # Good variable names which should always be accepted, separated by a comma
-# Update this to supress warnings about inherrited names (C0103)
-good-names=_,a,b,c,i,j,k,v,d,f,s,t,l,ex,__
+good-names=f,logger,_
 
 # Bad variable names which should always be refused, separated by a comma
 bad-names=foo,bar,baz,toto,tutu,tata
 
 # List of builtins function names that should not be used, separated by a comma
-bad-functions=apply,input,reduce
+bad-functions=apply,input
+
+
+# checks for sign of poor/misdesign:
+# * number of methods, attributes, local variables...
+# * size, complexity of functions, methods
+#
+[DESIGN]
+
+# Maximum number of arguments for function / method
+max-args=5
+
+# Maximum number of locals for function / method body
+max-locals=15
+
+# Maximum number of return / yield for function / method body
+max-returns=6
+
+# Maximum number of branch for function / method body
+max-branchs=12
+
+# Maximum number of statements in function / method body
+max-statements=50
+
+# Maximum number of parents for a class (see R0901).
+max-parents=7
+
+# Maximum number of attributes for a class (see R0902).
+max-attributes=7
+
+# Minimum number of public methods for a class (see R0903).
+min-public-methods=2
+
+# Maximum number of public methods for a class (see R0904).
+max-public-methods=20
 
 
 # checks for :
 # * methods without self as first argument
 # * overridden methods signature
-# * access only to existant members via self
+# * access only to existent members via self
 # * attributes not defined in the __init__ method
 # * supported interfaces implementation
 # * unreachable code
 #
-
 [CLASSES]
-enable-classes=yes
 
 # List of interface methods to ignore, separated by a comma. This is used for
 # instance to not check methods defines in Zopes Interface base class.
@@ -209,57 +240,40 @@
 # * uses of deprecated modules
 #
 [IMPORTS]
-enable-imports=yes
 
 # Deprecated modules which should not be used, separated by a comma
-deprecated-modules=regsub,TERMIOS,Bastion,rexec
+deprecated-modules=regsub,string,TERMIOS,Bastion,rexec
 
 # Create a graph of every (i.e. internal and external) dependencies in the
-# given file (report R0402 must not be disabled)
+# given file (report RP0402 must not be disabled)
 import-graph=
 
-# Create a graph of external dependencies in the given file (report R0402 must
+# Create a graph of external dependencies in the given file (report RP0402 must
 # not be disabled)
 ext-import-graph=
 
-# Create a graph of internal dependencies in the given file (report R0402 must
+# Create a graph of internal dependencies in the given file (report RP0402 must
 # not be disabled)
 int-import-graph=
 
 
-# checks for sign of poor/misdesign:
-# * number of methods, attributes, local variables...
-# * size, complexity of functions, methods
+# checks for :
+# * unauthorized constructions
+# * strict indentation
+# * line length
+# * use of <> instead of !=
 #
-[DESIGN]
-enable-design=no
-
-# Maximum number of arguments for function / method (see R0913)
-max-args=10
-
-# Maximum number of locals for function / method body (see R0914)
-max-locals=20
-
-# Maximum number of return / yield for function / method body
-max-returns=10
-
-# Maximum number of branch for function / method body (see R0912)
-max-branchs=15
-
-# Maximum number of statements in function / method body (see R0915)
-max-statements=50
-
-# Maximum number of parents for a class (see R0901).
-max-parents=7
-
-# Maximum number of attributes for a class (see R0902).
-max-attributes=20
-
-# Minimum number of public methods for a class (see R0903).
-min-public-methods=0
-
-# Maximum number of public methods for a class (see R0904).
-max-public-methods=100
+[FORMAT]
+
+# Maximum number of characters on a single line.
+max-line-length=79
+
+# Maximum number of lines in a module
+max-module-lines=2000
+
+# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1
+# tab).
+indent-string='    '
 
 
 # checks for similarities and duplicated code. This computation may be
@@ -267,7 +281,6 @@
 # problems.
 #
 [SIMILARITIES]
-enable-similarities=no
 
 # Minimum lines number of a similarity.
 min-similarity-lines=4
@@ -284,27 +297,6 @@
 # * PEP 263: source code with non ascii character but no encoding declaration
 #
 [MISCELLANEOUS]
-enable-miscellaneous=no
 
 # List of note tags to take in consideration, separated by a comma.
-notes=FIXME,XXX,TODO,fixme,todo
-
-
-# checks for :
-# * unauthorized constructions
-# * strict indentation
-# * line length
-# * use of <> instead of !=
-#
-[FORMAT]
-enable-format=yes
-
-# Maximum number of characters on a single line.
-max-line-length=79
-
-# Maximum number of lines in a module
-max-module-lines=1500
-
-# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1
-# tab).
-indent-string='    '
+notes=FIXME,XXX,TODO,fixme,xxx,todo

=== modified file 'test'
--- test	2010-08-13 18:34:05 +0000
+++ test	2010-09-14 21:39:47 +0000
@@ -16,6 +16,12 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-`which xvfb-run` trial magicicada$@
-pylint magicicada
-pep8 --repeat .
+if [ $# -ne 0 ]; then
+    MODULE="$@"
+else
+    MODULE="magicicada"
+fi
+
+echo "Running test suite for ""$MODULE"
+`which xvfb-run` trial "$MODULE" && pylint magicicada && pep8 --repeat .
+rm -rf _trial_temp