Merge lp:~cmiller/desktopcouch/use-library-to-replicate into lp:desktopcouch

[Chad Miller]

Change to the new system of initiating replication with python-couchdb. (LP: #700128)

[Eric Casteleijn (thisfred)]

I like it!

review: Approve

[Martin Albisetti (beuno)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~cmiller/desktopcouch/use-library-to-replicate into lp:desktopcouch failed. Below is the output from the failed tests.

Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmpdSvDjc/data/couchdb.html
desktopcouch.application.tests.test_start_local_couchdb
  TestUpdateDesignDocuments
    test_create_databases_and_design_docs ... [OK]
desktopcouch.application.tests.test_service
  TestService
    test_start_desktopcouch_replication ... [OK]
    test_start_new_desktopcouch_extensions ... [OK]
    test_start_new_desktopcouch_no_extensions ... [OK]
desktopcouch.application.tests.test_local_files
  TestKeyringIntegration
    test_with_auth ... [OK]
    test_with_no_auth ... [OK]
  TestLocalFiles
    test_all_files_returned ... [OK]
    test_bind_address ... [OK]
    test_couch_chain_ini_files ... [OK]
    test_xdg_overwrite_works ... [OK]
desktopcouch.application.tests.test_replication
  TestReplication
    test_creation ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmpv5BArG/data/couchdb.html
                                                     [OK]
  TestUbuntuoneReplication
    test_exclusion ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmpcAHGjK/data/couchdb.html
                                                    [OK]
desktopcouch.application.migration.tests.test_migration
  TestMigration
    test_migration_deleted_flag_to_trash ... [OK]
    test_migration_in_face_of_broken_records ... [OK]
    test_migration_script_is_run ... [OK]
    test_migration_script_is_run_and_can_access_view ... [OK]
  TestRegistration
    test_register_migration_is_added_to_the_registry ... [OK]
desktopcouch.application.platform.linux.tests.test_keyring
  TestGnomeKeyring
    test_get_aouth_no_keyring ... [OK]
    test_get_oauth_canceled_store ... [OK]
    test_get_oauth_data_stored ... [OK]
    test_get_user_name_password_keyring ... [OK]
    test_get_user_name_password_no_daemon ... [OK]
    test_get_user_name_password_not_in_keyring ... [OK]
    test_get_user_name_password_user_cancel ... [OK]
desktopcouch.application.platform.windows.tests.test_keyring
  TestKeyring
    test_get_oauth_data ... [OK]
    test_get_user_name_password ... [OK]
    test_get_user_name_password_no_key ... ...

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~cmiller/desktopcouch/use-library-to-replicate into lp:desktopcouch failed. Below is the output from the failed tests.

Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmpl92E6m/data/couchdb.html
desktopcouch.application.tests.test_start_local_couchdb
  TestUpdateDesignDocuments
    test_create_databases_and_design_docs ... [OK]
desktopcouch.application.tests.test_service
  TestService
    test_start_desktopcouch_replication ... [OK]
    test_start_new_desktopcouch_extensions ... [OK]
    test_start_new_desktopcouch_no_extensions ... [OK]
desktopcouch.application.tests.test_local_files
  TestKeyringIntegration
    test_with_auth ... [OK]
    test_with_no_auth ... [OK]
  TestLocalFiles
    test_all_files_returned ... [OK]
    test_bind_address ... [OK]
    test_couch_chain_ini_files ... [OK]
    test_xdg_overwrite_works ... [OK]
desktopcouch.application.tests.test_replication
  TestReplication
    test_creation ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmpksxkHq/data/couchdb.html
                                                     [OK]
  TestUbuntuoneReplication
    test_exclusion ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmpvvk8Ib/data/couchdb.html
                                                    [OK]
desktopcouch.application.migration.tests.test_migration
  TestMigration
    test_migration_deleted_flag_to_trash ... [OK]
    test_migration_in_face_of_broken_records ... [OK]
    test_migration_script_is_run ... [OK]
    test_migration_script_is_run_and_can_access_view ... [OK]
  TestRegistration
    test_register_migration_is_added_to_the_registry ... [OK]
desktopcouch.application.platform.linux.tests.test_keyring
  TestGnomeKeyring
    test_get_aouth_no_keyring ... [OK]
    test_get_oauth_canceled_store ... [OK]
    test_get_oauth_data_stored ... [OK]
    test_get_user_name_password_keyring ... [OK]
    test_get_user_name_password_no_daemon ... [OK]
    test_get_user_name_password_not_in_keyring ... [OK]
    test_get_user_name_password_user_cancel ... [OK]
desktopcouch.application.platform.windows.tests.test_keyring
  TestKeyring
    test_get_oauth_data ... [OK]
    test_get_user_name_password ... [OK]
    test_get_user_name_password_no_key ... ...

[lp:~cmiller/desktopcouch/use-library-to-replicate]

254. By Chad Miller on 2011-01-10

Shorten line to placate pylint.

=== modified file 'desktopcouch/application/pair/couchdb_pairing/couchdb_io.py'
--- desktopcouch/application/pair/couchdb_pairing/couchdb_io.py	2010-11-26 22:58:19 +0000
+++ desktopcouch/application/pair/couchdb_pairing/couchdb_io.py	2011-01-10 17:05:05 +0000
@@ -294,7 +294,6 @@
         assert "consumer_secret" in target_oauth
         target = dict(url=target, auth=dict(oauth=target_oauth))
 
-    record = dict(source=source, target=target)
     try:
         # regardless of source and target, we talk to our local couchdb  :(
         if not local_uri:
@@ -307,13 +306,12 @@
 
         # All until python-couchdb gets a Server.replicate() function
         local_server = server.DesktopServer(local_uri, ctx=ctx)
-        resp, data = local_server.resource.post(path='/_replicate',
-                content=record)
+        resp, data = local_server.replicate(source, target)
         logging.debug(
             "replicate result:  %r  %r", obsfuscate(resp), obsfuscate(data))
     except:                             # pylint: disable=W0702
-        logging.exception("can't replicate %r  %r <== %r", source_database,
-                local_uri, obsfuscate(record))
+        logging.exception("can't replicate %r %r <= %r to %r", source_database,
+                local_uri, obsfuscate(source), obsfuscate(target))
 
 
 def get_pairings(uri=None, ctx=local_files.DEFAULT_CONTEXT):