Merge lp:~adiroiban/couchdb-glib/couchdb-test-setup into lp:couchdb-glib

[Adi Roiban]

Add setUp and tearDown of CouchDB server for couchdb-glib tests.

= Bug 556671 =

When running the couchdb-glib tests, the testsuite should setUp and tearDown the an empty
couchdb server

== Proposed fix ==

Before running the couchdb-glib test, the Makefile should first setup and empty CouchDB used just for testing and when the test are done to tear down the server.

== Implementation details ==

The new server is using the configuration from tests/config/couchdb-auth.ini with data stored in tests/var.

It is using a predefined username/password and hostname/port_nr.

I have also fixed the name used for creating a new database since UUID can start with a number, while couchdb db names not.

Maybe we should change the port_nr used for testing to not be the default port.

[Rodrigo Moya (rodrigo-moya)]

hmm, doesn't seem to work for me:

$ cd tests
$ make test
Setting up the couchdb server...
Apache CouchDB needs write permission on the STDOUT file: ../tests/var/couchdb.stdout
make: *** [test] Error 1

Also, I think we should do the cleanup after running the tests, that is, what there is in stop-couchdb rule should go after running test-desktopcouch-glib

Anyway, this is a very needed branch, so thanks!

review: Needs Fixing

[Adi Roiban (adiroiban)]

Hi,

Sorry for pushing this bad branch.
In my initial test it looks like couchdb can create the var folder if it not there. This is true, but it does not create the parent.

This is fixed.

Maybe we can move the functionality of starting and stoping a testing couchdb server in a different script.
What do you say?

I was thinking of adding extra configuration for also testing basic http and oauth authentication.

I'm stoppping the couchdb server before desktopcouch-glib, since desktopcouch will use the user server anyway.
For starting a testing desktopcouch server, we need to shut down the current one and change the dbus config to start our server.

[lp:~adiroiban/couchdb-glib/couchdb-test-setup]

180. By Adi Roiban on 2010-04-09

Delete pid file. Create an empty var folder before starting the couchdb server.

[Rodrigo Moya (rodrigo-moya)]

Works great now! But I think that, given that we are starting a new couchdb instance, shouldn't we use a different port than 5984, which is the one used by the system wide couchdb instance?

[Rodrigo Moya (rodrigo-moya)]

Ok, approving it

review: Approve

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2010-01-08 15:47:33 +0000
+++ tests/Makefile.am	2010-04-09 12:13:26 +0000
@@ -1,3 +1,7 @@
+NULL = 
+SUBDIRS = \
+        $(NULL)
+
 INCLUDES =				\
 	$(COUCHDB_GLIB_CFLAGS)		\
 	$(DESKTOPCOUCH_GLIB_CFLAGS)	\
@@ -44,6 +48,31 @@
 
 check_PROGRAMS = test-couchdb-glib
 
+
+COUCHDB_VAR = $(top_srcdir)/tests/var
+COUCHDB_PID = $(top_srcdir)/tests/config/couchdb.pid
+COUCHDB_STDOUT = $(top_srcdir)/tests/var/couchdb.stdout
+COUCHDB_STDERR = $(top_srcdir)/tests/var/couchdb.stderr
+COUCHDB_CONFIG_NOAUTH = $(top_srcdir)/tests/config/couchdb-noauth.ini
+COUCHDB_CONFIG_AUTH = $(top_srcdir)/tests/config/couchdb-auth.ini
+
+
+stop-couchdb:
+	@/usr/bin/couchdb -p $(COUCHDB_PID) -d
+	@/bin/rm -f $(COUCHDB_PID)
+
 test: $(check_PROGRAMS)
-	$(top_srcdir)/tests/test-couchdb-glib
-	$(top_srcdir)/tests/test-desktopcouch-glib
+	@echo "Setting up the couchdb server..."
+	@/bin/rm -rf $(COUCHDB_VAR)
+	@/bin/mkdir -p $(COUCHDB_VAR)
+	@/usr/bin/couchdb -p $(COUCHDB_PID) -d > /dev/null
+	@/usr/bin/couchdb -n -a /etc/couchdb/default.ini \
+	    -o $(COUCHDB_STDOUT) -e $(COUCHDB_STDERR) \
+	    -a $(COUCHDB_CONFIG_AUTH) -p $(COUCHDB_PID) -b > /dev/null
+	@/bin/sleep 1
+	@$(top_srcdir)/tests/test-couchdb-glib "http://test:test@127.0.0.1:5984"
+	@echo "Tearing down up the couchdb server..."
+	@/usr/bin/couchdb -p $(COUCHDB_PID) -d > /dev/null
+	@/bin/rm -f $(COUCHDB_PID)
+	@/bin/rm -rf $(COUCHDB_VAR)
+	@$(top_srcdir)/tests/test-desktopcouch-glib

=== added directory 'tests/config'
=== added file 'tests/config/couchdb-auth.ini'
--- tests/config/couchdb-auth.ini	1970-01-01 00:00:00 +0000
+++ tests/config/couchdb-auth.ini	2010-04-09 12:13:26 +0000
@@ -0,0 +1,29 @@
+[couch_httpd_auth]
+require_valid_user = true
+
+[oauth_consumer_secrets]
+tLsCckqFPV = ntRaiJiuBX
+
+[oauth_token_users]
+tqSUhjJRMs = tpxQsaDSWd
+
+[oauth_token_secrets]
+tqSUhjJRMs = sHdBksSvmL
+
+[httpd]
+bind_address = 127.0.0.1
+port = 5984
+
+[couchdb]
+view_index_dir = var/couchdb_auth
+database_dir = var/couchdb_auth
+
+[log]
+file = var/couchdb-auth.log
+level = info
+
+; username = test
+; password = test
+[admins]
+test = -hashed-d175a4432182ff1abd6841c58fa25d3b51a59ec1,e57c36d165189a813392886b34e6f7d2
+

=== modified file 'tests/test-couchdb-glib.c'
--- tests/test-couchdb-glib.c	2010-01-11 16:57:19 +0000
+++ tests/test-couchdb-glib.c	2010-04-09 12:13:26 +0000
@@ -115,6 +115,10 @@
 	dbname = generate_uuid ();
 	g_assert (dbname != NULL);
 
+	/* Database name can not start with a digit
+	 * we will overwrite the first character with 'a' */
+	 dbname[0] = 'a';
+
 	/* Create database */
 	couchdb_session_create_database (couchdb, dbname, &error);
 	if (error) {