Merge lp:~sidnei/ubuntuone-dev-tools/memento-handler-merge into lp:ubuntuone-dev-tools

[Sidnei da Silva]

Merge MementoHandler with the implementation from filesync

Merge MementoHandler with the implementation from filesync

[dobey (dobey)]

Can you file a bug explaining what is wrong with the current code, and commit --fixes=lp:thatbug to link this branch to it? And provide a more explicit commit message of what the changes are. It's also worth noting that this breaks feature/api freeze in Precise, so the changes won't be making it into the packages there, but only in trunk, when this does land. Either way, a bug report would be good to refer to if we need to in the future. Thanks.

review: Needs Information

[Sidnei da Silva (sidnei)]

On Mon, Apr 2, 2012 at 5:43 PM, Rodney Dawes <email address hidden> wrote:
> Review: Needs Information
>
> Can you file a bug explaining what is wrong with the current code, and commit --fixes=lp:thatbug to link this branch to it? And provide a more explicit commit message of what the changes are. It's also worth noting that this breaks feature/api freeze in Precise, so the changes won't be making it into the packages there, but only in trunk, when this does land. Either way, a bug report would be good to refer to if we need to in the future. Thanks.

There's nothing wrong with the current code. It was just needlessly
duplicated in the ubuntuone-servers test suite, so I'm merging the
additional code from there so there's only one implementation. All but
one test suite in u1-servers are already using the implementation from
ubuntuone-dev-tools.

I'm fine with the changes only being in trunk, since it's being used
as a sourcedep there.

--
Sidnei

Make the most of Ubuntu with Ubuntu One
http://one.ubuntu.com

[Curtis Caravone (caravone)]

So there will be a follow up branch to make everything reference this version of MementoHandler?

review: Approve

[dobey (dobey)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~sidnei/ubuntuone-dev-tools/memento-handler-merge into lp:ubuntuone-dev-tools failed. Below is the output from the failed tests.

ubuntuone.devtools.testcases
  BaseTestCase
    runTest ... [OK]
ubuntuone.devtools.tests.test_decorators
  TestSkipBasicDecorators
    test_skip_class ... [OK]
    test_skip_decorators ... [OK]
ubuntuone.devtools.tests.test_txcheck
  TestCheckTwistedTestClass
    test_bad_mixin_order ... [OK]
    test_bare_super ... [OK]
    test_inline_callbacks ... [OK]
    test_inline_callbacks_missing ... [OK]
    test_missing_return ... [OK]
    test_no_problems ... [OK]
    test_not_twisted ... [OK]
    test_ok_mixin_order ... [OK]
    test_super_not_called ... [OK]
  TestTwistedCheckSuite
    test_suite_catches_problems ... [OK]
    test_suite_runs_tests ... [OK]
twisted.trial.unittest
  TestCase
    runTest ... [OK]
ubuntuone.devtools.testcases.dbus
  DBusTestCase
    runTest ... [OK]
ubuntuone.devtools.services.tests.test_dbus
  TestWithDBus
    test_config_file_path ... [OK]
    test_dbus_session_is_running ... [OK]
ubuntuone.devtools.testcases
  BaseTestCase
    runTest ... [OK]
ubuntuone.devtools.services.tests.test_squid
  EnvironTestCase
    test_delete_proxy_settings_present ... [OK]
    test_retrieve_proxy_settings ... [OK]
    test_store_settings ... [OK]
  PathsTestCase
    test_get_auth_temp_path ... [OK]
    test_get_basedir_missing ... [OK]
    test_get_basedir_present ... [OK]
    test_get_spool_temp_path_missing ... [OK]
    test_get_spool_temp_path_present ... [OK]
    test_get_squid_temp_path_missing ... [OK]
    test_get_squid_temp_path_present ... [OK]
  SquidRunnerInitTestCase
    test_htpasswd_missing ... [OK]
    test_squid_missing ... [OK]
  SquidRunnerTestCase
    test_generate_auth_file ... ...

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~sidnei/ubuntuone-dev-tools/memento-handler-merge into lp:ubuntuone-dev-tools failed. Below is the output from the failed tests.

ubuntuone.devtools.testcases
  BaseTestCase
    runTest ... [OK]
ubuntuone.devtools.tests.test_decorators
  TestSkipBasicDecorators
    test_skip_class ... [OK]
    test_skip_decorators ... [OK]
ubuntuone.devtools.tests.test_txcheck
  TestCheckTwistedTestClass
    test_bad_mixin_order ... [OK]
    test_bare_super ... [OK]
    test_inline_callbacks ... [OK]
    test_inline_callbacks_missing ... [OK]
    test_missing_return ... [OK]
    test_no_problems ... [OK]
    test_not_twisted ... [OK]
    test_ok_mixin_order ... [OK]
    test_super_not_called ... [OK]
  TestTwistedCheckSuite
    test_suite_catches_problems ... [OK]
    test_suite_runs_tests ... [OK]
twisted.trial.unittest
  TestCase
    runTest ... [OK]
ubuntuone.devtools.testcases.dbus
  DBusTestCase
    runTest ... [OK]
ubuntuone.devtools.services.tests.test_dbus
  TestWithDBus
    test_config_file_path ... [OK]
    test_dbus_session_is_running ... [OK]
ubuntuone.devtools.testcases
  BaseTestCase
    runTest ... [OK]
ubuntuone.devtools.services.tests.test_squid
  EnvironTestCase
    test_delete_proxy_settings_present ... [OK]
    test_retrieve_proxy_settings ... [OK]
    test_store_settings ... [OK]
  PathsTestCase
    test_get_auth_temp_path ... [OK]
    test_get_basedir_missing ... [OK]
    test_get_basedir_present ... [OK]
    test_get_spool_temp_path_missing ... [OK]
    test_get_spool_temp_path_present ... [OK]
    test_get_squid_temp_path_missing ... [OK]
    test_get_squid_temp_path_present ... [OK]
  SquidRunnerInitTestCase
    test_htpasswd_missing ... [OK]
    test_squid_missing ... [OK]
  SquidRunnerTestCase
    test_generate_auth_file ... ...

[lp:~sidnei/ubuntuone-dev-tools/memento-handler-merge]

63. By Sidnei da Silva on 2012-04-04

- Whitespace

=== modified file 'ubuntuone/devtools/handlers.py'
--- ubuntuone/devtools/handlers.py	2012-03-30 17:44:03 +0000
+++ ubuntuone/devtools/handlers.py	2012-04-04 19:17:29 +0000
@@ -48,15 +48,25 @@
         self.format(record)
         self.records.append(record)
 
+    def dump_contents(self, msgs):
+        """Dumps the contents of the MementoHandler."""
+        if self.debug:
+            print "Expecting:"
+            for msg in msgs:
+                print "\t", msg
+            print "MementoHandler contents:"
+            for rec in self.records:
+                print "\t", rec.exc_info
+                print "\t", logging.getLevelName(rec.levelno)
+                print "\t\t", rec.message
+                print "\t\t", rec.exc_text
+
     def check(self, level, *msgs):
-        """Verifies that the msgs are logged in the specified level."""
+        """Verifies that the msgs are logged in the specified level"""
         for rec in self.records:
             if rec.levelno == level and all(m in rec.message for m in msgs):
-                return True
-        if self.debug:
-            recorded = [(logging.getLevelName(r.levelno), r.message)
-                        for r in self.records]
-            print "Memento messages:", recorded
+                return rec
+        self.dump_contents(msgs)
         return False
 
     def check_debug(self, *msgs):
@@ -75,11 +85,11 @@
         """Shortcut for checking in ERROR."""
         return self.check(logging.ERROR, *msgs)
 
-    def check_exception(self, exception_class, *msgs):
+    def check_exception(self, exception_info, *msgs):
         """Shortcut for checking exceptions."""
         for rec in self.records:
-            if rec.levelno == logging.ERROR and \
-               all(m in rec.exc_text for m in msgs) and \
-               exception_class == rec.exc_info[0]:
+            if (rec.levelno == logging.ERROR and
+                all(m in rec.exc_text + rec.message for m in msgs) and
+                exception_info in rec.exc_info):
                 return True
         return False