Merge lp:~thisfred/desktopcouch/fix_tests_yet_again into lp:desktopcouch

[Eric Casteleijn]

Correctly chains .ini files, and fix one test that talked to the system couchdb on port 5984.

[Eric Casteleijn (thisfred)]

This corrects the command line switches to chain the ini files correctly. Turns out that was never done correctly before. That's ok because this made us find a bug in couchdb itself. This code should work with the current version of couchdb, although it may not yet do the right thing completely. For that we need a newer version of the 0.10 branch of couchdb packaged which has a fix.

I also made the create contacts script talk to desktopcouch instead of the system couchdb.

[Facundo Batista (facundo)]

Looks ok, but you should place a comment in the import/reload stuff in __init__.py

review: Approve

[Eric Casteleijn (thisfred)]

> Looks ok, but you should place a comment in the import/reload stuff in
> __init__.py

thanks will do!

[John O'Brien (jdobrien)]

review: Approve

[lp:~thisfred/desktopcouch/fix_tests_yet_again]

59. By Eric Casteleijn on 2009-09-10

added a comment

=== modified file 'desktopcouch/__init__.py'
--- desktopcouch/__init__.py	2009-09-01 00:38:53 +0000
+++ desktopcouch/__init__.py	2009-09-09 23:24:53 +0000
@@ -16,7 +16,7 @@
 "Desktop Couch helper files"
 
 from __future__ import with_statement
-import os, re, time
+import os, re
 from desktopcouch.start_local_couchdb import process_is_couchdb, read_pidfile
 
 def find_pid(start_if_not_running=True):

=== modified file 'desktopcouch/contacts/testing/create.py'
--- desktopcouch/contacts/testing/create.py	2009-09-04 08:59:18 +0000
+++ desktopcouch/contacts/testing/create.py	2009-09-09 23:24:53 +0000
@@ -22,6 +22,7 @@
 import random, string, uuid
 
 from couchdb import Server
+import desktopcouch
 
 CONTACT_DOCTYPE = 'http://www.freedesktop.org/wiki/Specifications/desktopcouch/contact'
 COUCHDB_SYS_PORT = 5984
@@ -158,9 +159,12 @@
     return fielddict
 
 def create_many_contacts(
-        num_contacts=10, host='localhost', port=COUCHDB_SYS_PORT,
+        num_contacts=10, host='localhost', port=None,
         db_name='contacts', doctype=CONTACT_DOCTYPE, app_annots=None):
     """Make many contacts and create their records"""
+    if port is None:
+        desktopcouch.find_pid()
+        port = desktopcouch.find_port()
     server_url = 'http://%s:%s/' % (host, port)
     server = Server(server_url)
     db = server[db_name] if db_name in server else server.create(db_name)

=== modified file 'desktopcouch/local_files.py'
--- desktopcouch/local_files.py	2009-09-02 15:28:28 +0000
+++ desktopcouch/local_files.py	2009-09-09 23:24:53 +0000
@@ -67,7 +67,8 @@
     import distutils.version
     if distutils.version.LooseVersion(couchversion) >= \
             distutils.version.LooseVersion('0.10'):
-        chain = '-a'
+        # XXX: hardcoded path, won't work when couch is somewhere else.
+        chain = '-n -a /etc/couchdb/default.ini -a'
     else:
         chain = '-C'
 
@@ -78,7 +79,8 @@
         super(Exception, self).__init__()
         self.file_name = file_name
     def __str__(self):
-        return "OAuth details were not found in the ini file (%s)" % self.file_name
+        return "OAuth details were not found in the ini file (%s)" % (
+            self.file_name)
 
 def get_oauth_tokens(config_file_name=FILE_INI):
     """Return the OAuth tokens from the desktop Couch ini file.
@@ -136,4 +138,3 @@
 # You will need to add -b or -k on the end of this
 COUCH_EXEC_COMMAND = [COUCH_EXE, couch_chain_flag(), FILE_INI, '-p', FILE_PID,
   '-o', FILE_STDOUT, '-e', FILE_STDERR]
-

=== modified file 'desktopcouch/records/server.py'
--- desktopcouch/records/server.py	2009-09-01 15:12:14 +0000
+++ desktopcouch/records/server.py	2009-09-09 23:24:53 +0000
@@ -247,7 +247,7 @@
         """
         view_name = "get_records_and_type"
         view_map_js = """
-            function(doc) { 
+            function(doc) {
                 try {
                     if (! doc['application_annotations']['Ubuntu One']
                             ['private_application_annotations']['deleted']) {

=== modified file 'desktopcouch/tests/__init__.py'
--- desktopcouch/tests/__init__.py	2009-09-03 14:24:06 +0000
+++ desktopcouch/tests/__init__.py	2009-09-09 23:24:53 +0000
@@ -33,4 +33,5 @@
 
 import xdg.BaseDirectory
 reload(xdg.BaseDirectory)
-
+from desktopcouch import local_files
+reload(local_files)

=== modified file 'desktopcouch/tests/test_start_local_couchdb.py'
--- desktopcouch/tests/test_start_local_couchdb.py	2009-09-02 22:15:09 +0000
+++ desktopcouch/tests/test_start_local_couchdb.py	2009-09-09 23:24:53 +0000
@@ -71,7 +71,6 @@
 
     def setUp(self):
         # create temp folder with databases and design documents in
-        os.mkdir(os.path.join(xdg_data, "desktop-couch"))
         for d in DIRS:
             os.mkdir(os.path.join(xdg_data, "desktop-couch", d))
         for f, data in FILES.items():