lp:~robru/friends/debugging
- Get this branch:
- bzr branch lp:~robru/friends/debugging
Branch merges
- Ken VanDine: Approve
-
Diff: 8 lines (+1/-1)1 file modifiedfriends-service.sh (+1/-1)
Branch information
Recent revisions
- 8. By Barry Warsaw
-
Merge lp:~ken-vandine/friends/unsupported_handling which allows
AccountManager.add_new_ account( ) to log and ignore UnsupportedProt ocolErrors.
This is necessary because of the packaging requirement that protocols be
installable by separate binary packages.This means, if friends-
service- twitter (or the moral equivalent) is not
installed, the user may still have a Twitter account enabled, but there will
be no friends-service available for Twitter. This raises an
UnsupportedProtocolError, but that's fine, and to be expected. I had to fix a couple of other things along the way:
* Allow LogMock to work as a context manager (i.e. in a `with` statement).
Use it this way if you want to narrow down the capturing of log messages.
* Convert a few uses of LogMock from setUp()s to with-statements.
* Instead of setting the mock logger level at NOTSET, set it to the value 1.
NOTSET==0, but this propagates log messages to the root logger, even if
propagate=False, so it's not quite what we want to do. Unfortunately, this
also meant the log mocks are now capturing more output, but that's fine, I
adjusted the appropriate tests.
* Fix test_account_manager_ add_new_ account_ unsupported( ) to capture and check
the log messages. This proved that the test wasn't actually testing what it
thought it was testing. Now fixed.
* Fixed add_new_account() to narrow down the try/except clause. - 7. By Barry Warsaw
-
Merge lp:~robru/friends/count - with a few minor cleanups (pyflakes warnings,
etc.) - 6. By Barry Warsaw
-
* Add a wrapper script for easier in-source execution. (LP: #1067005)
* Add to README.rst information about the virtualenv. (LP: #1067002)
* Fix a crash in --list-protocols - 4. By Barry Warsaw
-
Post-merge cleanup.
* ReST-ify the README and give it an Emacs-friendly suffix.
* Spell-checked and reformatted. - 2. By Robert Bruce Park
-
Stop dumping all possible messages into 'messages' stream.
This commit introduces the 'private' stream, as well as unique
'search/*' streams that get created for every new search. This allows
the model to be filtered by the stream column, in such a way that it's
possible to show search results separately from the rest of the
messages (previously, if you performed a search, there would be no way
to distinguish search results from any other message in the 'messages' stream).
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:friends