Merge lp:~lazypower/charms/precise/mongodb/ci-fix into lp:charms/mongodb

[Charles Butler]

Refactored tests for CI

Altered test_configs to correct non-time-wait context for mongodb to setup -
which on average takes approx 5 to 6 minutes on Local provider. Moved 00_setup
to 00-setup to comply with nomenclature from charm add tests

[Charles Butler (lazypower)]

Please take a look.

[Juan L. Negron (negronjl)]

Hi Charles:

Thanks for the MP. It looks good to me ... merging it.

-Juan

review: Approve

=== added file 'tests/00-setup'
--- tests/00-setup	1970-01-01 00:00:00 +0000
+++ tests/00-setup	2014-02-25 21:52:13 +0000
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+sudo apt-get install python-setuptools -y
+
+if [ -f '/etc/apt.d/sources.list.d/juju-stable-precise.list' ]; then
+	sudo add-apt-repository ppa:juju/stable -y
+fi
+
+sudo apt-get update
+
+sudo apt-get install amulet python3 python3-requests python3-pymongo juju-core charm-tools python-mock -y

=== removed file 'tests/00_setup.sh'
--- tests/00_setup.sh	2014-01-28 21:51:49 +0000
+++ tests/00_setup.sh	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-sudo apt-get install python-setuptools -y
-
-if [ -f '/etc/apt.d/sources.list.d/juju-stable-precise.list' ]; then
-	sudo add-apt-repository ppa:juju/stable -y
-fi
-
-sudo apt-get update
-
-sudo apt-get install amulet python3 python3-requests python3-pymongo juju-core charm-tools  -y

=== modified file 'tests/100_configs.test'
--- tests/100_configs.test	2012-01-31 01:19:12 +0000
+++ tests/100_configs.test	2014-02-25 21:52:13 +0000
@@ -12,22 +12,41 @@
 
 for try in `seq 1 600` ; do
     host=`juju status | tests/get-unit-info mongodb public-address`
+    
     if [ -z "$host" ] ; then
-        sleep 1
+        sleep 10
     else
         break
     fi
 done
 
 if [ -z "$host" ] ; then
-    echo FAIL: status timed out
+    echo FAIL: host timed out
     exit 1
 fi
 
+assert_unit_ready() {
+    for try in `seq 1 600` ; do
+        status=`juju status | tests/get-unit-info mongodb agent-state`
+        if [ "$status" != "started" ] ; then
+            sleep 10
+        else
+            echo "found status as $status"
+            break
+        fi
+    done
+
+    if [ -z "$status" ] ; then
+        echo FAIL: status timed out
+        exit 1
+    fi
+}
+
 assert_is_listening() {
     local port=$1
+    tries=$2 
     listening=""
-    for try in `seq 1 10` ; do
+    for try in `seq 1 $tries` ; do
         if ! nc $host $port < /dev/null ; then
             continue
         fi
@@ -36,18 +55,19 @@
     done
 
     if [ -z "$listening" ] ; then
-       echo "FAIL: not listening on port 27017 after 10 retries"
+       echo "FAIL: not listening on port $port after $tries retries"
        return 1
     else
-       echo "PASS: listening on port 27017"
+       echo "PASS: listening on port $port"
        return 0
     fi
 }
 
-assert_is_listening 27017
-
-juju set mongodb default_port=55555
-
-assert_is_listening 55555
+assert_unit_ready
+
+assert_is_listening 27017 10
+
+juju set mongodb port=55555
+assert_is_listening 55555 200000
 echo PASS: config changes tests passed.
 exit 0