desktopcouch

Merge lp://qastaging/~urbanape/desktopcouch/fix-516128 into lp://qastaging/desktopcouch

fix-516128
Merge into trunk

Proposed by Zachery Bir on 2010-04-06

Status:

Merged

Approved by:

Tim Cole on 2010-04-06

Approved revision:

147

Merged at revision:

not available

Proposed branch:

lp://qastaging/~urbanape/desktopcouch/fix-516128

Merge into:

lp://qastaging/desktopcouch

Diff against target:

157 lines (+140/-0)

3 files modified

desktopcouch/bookmarks/__init__.py (+20/-0)
desktopcouch/bookmarks/record.py (+60/-0)
desktopcouch/bookmarks/tests/test_record.py (+60/-0)

To merge this branch:

bzr merge lp://qastaging/~urbanape/desktopcouch/fix-516128

Related bugs:

Bug #516128: Create bookmarks webui

Medium

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Tim Cole (community)		Approve on 2010-04-06
Eric Casteleijn (community)	2010-04-06	Approve on 2010-04-06
Review via email: mp+22909@code.qastaging.launchpad.net

Commit message

Add bookmark records to desktopcouch.

Description of the change

Add the minimal stuff for Bookmarks records.

Revision history for this message

Eric Casteleijn (thisfred) wrote on 2010-04-06:

Looks good, tests give one error, looks like a pasto in the import:

===============================================================================
[ERROR]: desktopcouch.bookmarks.tests.test_record

Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/twisted/trial/runner.py", line 563, in loadPackage
    module = modinfo.load()
  File "/usr/lib/python2.6/dist-packages/twisted/python/modules.py", line 381, in load
    return self.pathEntry.pythonPath.moduleLoader(self.name)
  File "/usr/lib/python2.6/dist-packages/twisted/python/reflect.py", line 464, in namedAny
    topLevelPackage = _importAndCheckStack(trialname)
  File "/home/eric/canonical/desktopcouch/fix-516128/desktopcouch/bookmarks/tests/test_record.py", line 24, in <module>
    from desktopcouch.contacts.record import \
exceptions.ImportError: cannot import name Bookmark
-------------------------------------------------------------------------------