Merge lp:~cmiller/desktopcouch/fix-replication-getport-nouri into lp:desktopcouch

[Chad Miller]

Cover a single place were replication was not fully qualifying its accesses to Databases with a specific URL.

[Stuart Langridge (sil)]

Seems OK to me.

review: Approve

[Eric Casteleijn (thisfred)]

I get dbus errors :(

(Full test report pasted since on of them is in a passing test, and I don't know if that's intended)

desktopcouch.contacts.tests.test_contactspicker
  TestContactsPicker
    test_can_contruct_contactspicker ... [OK]
desktopcouch.contacts.tests.test_create
  TestCreate
    test_create_many_contacts ... [OK]
    test_head_or_tails ... [OK]
    test_random_bools ... [OK]
desktopcouch.contacts.tests.test_record
  TestContactRecord
    test_contact_record ... [OK]
desktopcouch.pair.tests.test_couchdb_io
  TestCouchdbIo
    test_get_database_names_replicatable ... [OK]
    test_get_database_names_replicatable_bad_server ... [SKIPPED]
    test_get_my_host_unique_id ... ERROR:dbus.proxies:Introspect error on :1.117:/: dbus.exceptions.DBusException: org.freedesktop.DBus.Error.NoReply: Did not receive a reply. Possible causes include: the remote application did not send a reply, the message bus security policy blocked the reply, the reply timeout expired, or the network connection was broken.
                                     [ERROR]
    test_mkuri ... [OK]
    test_obsfuscation ... [OK]
    test_put_dynamic_paired_host ... [OK]
    test_put_static_paired_service ... [OK]
desktopcouch.pair.tests.test_network_io
  TestNetworkIO
    test_successful_lifespan ... [OK]
desktopcouch.records.tests.test_couchgrid
  TestCouchGrid
    test_all_from_database ... [OK]
    test_constructor_guarded ... [OK]
    test_new_rows_with_headings ... [OK]
    test_no_headings_or_stored_records ... [OK]
    test_optional_args_no_stored_records ... [OK]
    test_optional_record_type_arg ... [OK]
    test_programatically_add_row ... [OK]
    test_selected_id_property ... [OK]
    test_single_col_from_database ... [OK]
desktopcouch.records.tests.test_field_registry
  TestFieldMapping
    test_mergeable_list_field_mapping ... [OK]
    test_mergeable_list_field_mapping_empty_field ... [OK]
    test_simple_field_mapping ... [OK]
  TestTransformer
    test_from_app ... [OK]
    test_run_doctests ... [OK]
    test_to_app ... [OK]
desktopcouch.records.tests.test_record
  TestRecordFactory
    test_build...

review: Needs Fixing

=== modified file 'desktopcouch/pair/couchdb_pairing/couchdb_io.py'
--- desktopcouch/pair/couchdb_pairing/couchdb_io.py	2010-02-26 22:23:42 +0000
+++ desktopcouch/pair/couchdb_pairing/couchdb_io.py	2010-03-03 13:44:14 +0000
@@ -232,7 +232,7 @@
                 target_host, target_port, target_database, use_ssl=target_ssl,
                 oauth_tokens=target_oauth)
         else:
-            server.CouchDatabase(target_database, create=True)
+            server.CouchDatabase(target_database, create=True, uri=local_uri)
         logging.debug("db exists, and we're ready to replicate")
     except:
         logging.exception("can't create/verify %r %s:%d  oauth=%s",