Merge lp:~tvansteenburgh/charms/trusty/mongodb/test-refactor into lp:charms/trusty/mongodb

[Tim Van Steenburgh]

Refactor tests. No tests have been removed, only restructured.

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_lint_check #925 trusty-mongodb for tvansteenburgh mp240740
    LINT FAIL: lint-test missing

LINT Results (max last 5 lines):
INFO:root:Workspace dir: /var/lib/jenkins/workspace/charm_lint_check
INFO:root:Reading file: Makefile
INFO:root:Searching for: ['@flake8']
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full lint test output: http://paste.ubuntu.com/8837661/
Build: http://10.98.191.181:8080/job/charm_lint_check/925/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_unit_test #760 trusty-mongodb for tvansteenburgh mp240740
    UNIT FAIL: unit-test missing

UNIT Results (max last 5 lines):
INFO:root:Workspace dir: /var/lib/jenkins/workspace/charm_unit_test
INFO:root:Reading file: Makefile
INFO:root:Searching for: ['nosetest', 'unit.test']
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full unit test output: http://paste.ubuntu.com/8837666/
Build: http://10.98.191.181:8080/job/charm_unit_test/760/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_amulet_test #343 trusty-mongodb for tvansteenburgh mp240740
    AMULET FAIL: amulet-test missing

AMULET Results (max last 5 lines):
INFO:root:Workspace dir: /var/lib/jenkins/workspace/charm_amulet_test
INFO:root:Reading file: Makefile
INFO:root:Searching for: ['@juju test']
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/8837667/
Build: http://10.98.191.181:8080/job/charm_amulet_test/343/

[Whit Morriss (whitmo)]

+1 LGTM

After finally getting the right version set up, tests ran and passed on 1.21beta2

review: Approve

[Matt Bruzek (mbruzek)]

+1 LGTM

review: Approve

=== modified file 'Makefile'
--- Makefile	2014-07-08 18:53:07 +0000
+++ Makefile	2014-11-05 15:54:19 +0000
@@ -16,7 +16,7 @@
 PYTHON := /usr/bin/env python
 
 unittest:
-	tests/10-unit.test
+	tests/01_test_write_log_rotate_config.py
 
 sync:
 	@mkdir -p bin

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-08-20 23:48:43 +0000
+++ hooks/hooks.py	2014-11-05 15:54:19 +0000
@@ -468,14 +468,14 @@
     current_try = 0
     while (process_check_pidfile('/var/run/mongodb/configsvr.pid') !=
     (None, None)) and not port_check(
-        unit_get('public-address'),
+        unit_get('private-address'),
         config_data['config_server_port']) and current_try < max_tries:
         juju_log("configsvr_status: Waiting for Config Server to be ready ...")
         time.sleep(wait_for)
         current_try += 1
     retVal = (
         process_check_pidfile('/var/run/mongodb/configsvr.pid') != (None, None)
-        ) == port_check(unit_get('public-address'),
+        ) == port_check(unit_get('private-address'),
         config_data['config_server_port']) is True
     if retVal:
         return(process_check_pidfile('/var/run/mongodb/configsvr.pid'))
@@ -558,14 +558,14 @@
     current_try = 0
     while (process_check_pidfile('/var/run/mongodb/mongos.pid') !=
     (None, None)) and not port_check(
-        unit_get('public-address'),
+        unit_get('private-address'),
         config_data['mongos_port']) and current_try < max_tries:
         juju_log("mongos_status: Waiting for Mongo shell to be ready ...")
         time.sleep(wait_for)
         current_try += 1
     retVal = \
         (process_check_pidfile('/var/run/mongodb/mongos.pid') !=
-        (None, None)) == port_check(unit_get('public-address'),
+        (None, None)) == port_check(unit_get('private-address'),
             config_data['mongos_port']) is True
     if retVal:
         return(process_check_pidfile('/var/run/mongodb/mongos.pid'))
@@ -645,7 +645,7 @@
 
 
 def restart_mongod(wait_for=default_wait_for, max_tries=default_max_tries):
-    my_hostname = unit_get('public-address')
+    my_hostname = unit_get('private-address')
     my_port = config('port')
     current_try = 0
 
@@ -776,6 +776,8 @@
     print "current_mongodb_port: ", current_mongodb_port
     public_address = unit_get('public-address')
     print "public_address: ", public_address
+    private_address = unit_get('private-address')
+    print "private_address: ", private_address
 
     # Update mongodb configuration file
     mongodb_config = mongodb_conf(config_data)
@@ -808,7 +810,7 @@
 
     # attach to replSet ( if needed )
     if config_data['replicaset_master'] != "auto":
-        join_replset(config_data['replicaset_master'], public_address)
+        join_replset(config_data['replicaset_master'], private_address)
 
     # arbiter
     if config_data['replicaset_master'] != 'auto':
@@ -816,7 +818,7 @@
         config_data['replicaset_master'] != "auto":
             if config_data['arbiter'] == 'enable':
                 enable_arbiter(config_data['replicaset_master'],
-                "%s:%s" % (public_address, config_data['port']))
+                "%s:%s" % (private_address, config_data['port']))
             else:
                 enable_arbiter(config_data['replicaset_master'],
                 config_data['arbiter'])
@@ -892,7 +894,7 @@
 @hooks.hook('database-relation-joined')
 def database_relation_joined():
     juju_log("database_relation_joined")
-    my_hostname = unit_get('public-address')
+    my_hostname = unit_get('private-address')
     my_port = config('port')
     my_replset = config('replicaset')
     juju_log("my_hostname: %s" % my_hostname)
@@ -910,7 +912,7 @@
 @hooks.hook('replicaset-relation-joined')
 def replica_set_relation_joined():
     juju_log("replica_set_relation_joined")
-    my_hostname = unit_get('public-address')
+    my_hostname = unit_get('private-address')
     my_port = config('port')
     my_replset = config('replicaset')
     my_install_order = os.environ['JUJU_UNIT_NAME'].split('/')[1]
@@ -933,7 +935,7 @@
 @hooks.hook('replicaset-relation-changed')
 def replica_set_relation_changed():
     juju_log("replica_set_relation_changed")
-    my_hostname = unit_get('public-address')
+    my_hostname = unit_get('private-address')
     my_port = config('port')
     my_install_order = os.environ['JUJU_UNIT_NAME'].split('/')[1]
     my_replicaset_master = config('replicaset_master')
@@ -1014,7 +1016,7 @@
 @hooks.hook('configsvr-relation-joined')
 def configsvr_relation_joined():
     juju_log("configsvr_relation_joined")
-    my_hostname = unit_get('public-address')
+    my_hostname = unit_get('private-address')
     my_port = config('config_server_port')
     my_install_order = os.environ['JUJU_UNIT_NAME'].split('/')[1]
     relation_set(relation_id(),
@@ -1038,7 +1040,7 @@
 @hooks.hook('mongos-relation-joined')
 def mongos_relation_joined():
     juju_log("mongos_relation_joined")
-    my_hostname = unit_get('public-address')
+    my_hostname = unit_get('private-address')
     my_port = config('mongos_port')
     my_install_order = os.environ['JUJU_UNIT_NAME'].split('/')[1]
     relation_set(relation_id(),
@@ -1079,7 +1081,7 @@
     elif rel_type == 'database':
         if mongos_ready():
             mongos_host = "%s:%s" % (
-                unit_get('public-address'),
+                unit_get('private-address'),
                 config('mongos_port'))
             shard_command1 = "sh.addShard(\"%s:%s\")" % (hostname, port)
             mongo_client(mongos_host, shard_command1)

=== modified file 'tests/00-setup' (properties changed: -x to +x)
--- tests/00-setup	2014-07-30 17:48:09 +0000
+++ tests/00-setup	2014-11-05 15:54:19 +0000
@@ -8,4 +8,4 @@
 sudo apt-get update
 
 
-sudo apt-get install amulet python3 python3-requests python3-pymongo juju-core charm-tools python-mock python-pymongo -y
+sudo apt-get install amulet python3 python3-requests python3-pymongo python-mock juju-core charm-tools -y

=== added file 'tests/01_test_write_log_rotate_config.py'
--- tests/01_test_write_log_rotate_config.py	1970-01-01 00:00:00 +0000
+++ tests/01_test_write_log_rotate_config.py	2014-11-05 15:54:19 +0000
@@ -0,0 +1,41 @@
+#!/usr/bin/env python
+
+import mock
+import os
+import unittest
+import tempfile
+import sys
+sys.path.append('hooks')
+import hooks
+
+
+class TestWriteLogrotateConfigFile(unittest.TestCase):
+
+    def test_success(self):
+        logpath = '/tmp/foo/foo.log'
+        config_data = {
+            'logpath': logpath,
+            'logrotate-frequency': 'daily',
+            'logrotate-maxsize': '5G',
+            'logrotate-rotate': 5,
+        }
+        fd, temp_fn = tempfile.mkstemp()
+        os.close(fd)
+        with mock.patch('hooks.juju_log') as mock_juju_log:
+            with mock.patch('hooks.open', create=True) as mock_open:
+                mock_open.return_value = mock.MagicMock(spec=file)
+                hooks.write_logrotate_config(config_data, temp_fn)
+                os.unlink(temp_fn)
+        mock_juju_log.assert_called_once_with('Writing {}.'.format(temp_fn))
+        mock_open.assert_called_once_with(temp_fn, 'w')
+        mock_file = mock_open().__enter__()
+        call_args = mock_file.write.call_args[0][0]
+        self.assertTrue(mock_file.write.called)
+        self.assertIn(logpath, call_args)
+        self.assertIn('daily', call_args)
+        self.assertIn('maxsize 5G', call_args)
+        self.assertIn('rotate 5', call_args)
+
+
+if __name__ == '__main__':
+    unittest.main()

=== removed file 'tests/10-unit.test'
--- tests/10-unit.test	2013-12-11 13:17:03 +0000
+++ tests/10-unit.test	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-#!/usr/bin/python
-
-"""Unit test suite."""
-
-import os
-import sys
-import unittest
-
-runner = unittest.TextTestRunner(verbosity=2)
-suite = unittest.TestLoader().discover(os.path.dirname(__file__))
-result = runner.run(suite)
-sys.exit(not result.wasSuccessful())

=== removed file 'tests/100_configs.test'
--- tests/100_configs.test	2014-02-25 21:37:07 +0000
+++ tests/100_configs.test	1970-01-01 00:00:00 +0000
@@ -1,73 +0,0 @@
-#!/bin/sh
-
-set -e
-
-teardown() {
-    juju destroy-service mongodb
-}
-trap teardown EXIT
-
-juju deploy mongodb
-juju expose mongodb
-
-for try in `seq 1 600` ; do
-    host=`juju status | tests/get-unit-info mongodb public-address`
-    
-    if [ -z "$host" ] ; then
-        sleep 10
-    else
-        break
-    fi
-done
-
-if [ -z "$host" ] ; then
-    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 $tries` ; do
-        if ! nc $host $port < /dev/null ; then
-            continue
-        fi
-        listening="27017"
-        break
-    done
-
-    if [ -z "$listening" ] ; then
-       echo "FAIL: not listening on port $port after $tries retries"
-       return 1
-    else
-       echo "PASS: listening on port $port"
-       return 0
-    fi
-}
-
-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

=== modified file 'tests/200_deploy.test'
--- tests/200_deploy.test	2014-02-03 22:18:52 +0000
+++ tests/200_deploy.test	2014-11-05 15:54:19 +0000
@@ -8,12 +8,12 @@
 # Test Quick Config
 #########################################################
 scale = 1
-seconds = 1400
+seconds = 2500
 
 #########################################################
 # 3shard cluster configuration
 #########################################################
-d = amulet.Deployment()
+d = amulet.Deployment(series='trusty')
 
 d.add('configsvr', charm='mongodb', units=scale)
 d.add('mongos', charm='mongodb', units=scale)

=== modified file 'tests/200_relate_ceilometer.test'
--- tests/200_relate_ceilometer.test	2014-07-29 19:57:17 +0000
+++ tests/200_relate_ceilometer.test	2014-11-05 15:54:19 +0000
@@ -1,43 +1,53 @@
 #!/usr/bin/env python3
 
+import unittest
+import subprocess
 import amulet
-import pdb
-
-class TestDeploy(object):
-
-    def __init__(self, time=2500):
-        # Attempt to load the deployment topology from a bundle.
-        self.deploy = amulet.Deployment(series="trusty")
-
-        # If something errored out, attempt to continue by
-        # manually specifying a standalone deployment
-        self.deploy.add('mongodb')
-        self.deploy.add('ceilometer', 'cs:trusty/ceilometer')
-        # send blank configs to finalize the objects in the deployment map
-        self.deploy.configure('mongodb', {})
-        self.deploy.configure('ceilometer', {})
-
-        self.deploy.relate('mongodb:database', 'ceilometer:shared-db')
+
+
+class TestDeploy(unittest.TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        time = 2500
+
+        d = amulet.Deployment(series="trusty")
+        d.add('mongodb')
+        d.add('ceilometer', 'cs:trusty/ceilometer')
+        d.relate('mongodb:database', 'ceilometer:shared-db')
+        d.expose('mongodb')
 
         try:
-            self.deploy.setup(time)
-            self.deploy.sentry.wait(time)
+            d.setup(time)
+            d.sentry.wait(time)
+        except amulet.helpers.TimeoutError:
+            amulet.raise_status(amulet.FAIL, msg="Environment standup timeout")
         except:
-            amulet.raise_status(amulet.FAIL, msg="Environment standup timeout")
-        # sentry = self.deploy.sentry
+            raise
 
-    def run(self):
-        for test in dir(self):
-            if test.startswith('test_'):
-                getattr(self, test)()
+        cls.mongo = d.sentry['mongodb/0']
+        cls.ceilometer = d.sentry['ceilometer/0']
+        cls.deployment = d
 
     def test_mongo_relation(self):
-        unit = self.deploy.sentry.unit['ceilometer/0']
-        mongo = self.deploy.sentry.unit['mongodb/0'].info['public-address']
-        cont = unit.file_contents('/etc/ceilometer/ceilometer.conf')
-        if mongo not in cont:
-            amulet.raise_status(amulet.FAIL, "Unable to verify ceilometer cfg")
+        """Test that ceilometer config contains mongo host address"""
+        mongo_private_address, _ = self.mongo.run('unit-get private-address')
+        conf = self.ceilometer.file_contents('/etc/ceilometer/ceilometer.conf')
+        self.assertTrue(mongo_private_address in conf)
+
+    def test_port_change(self):
+        """Test that mongo can be reached on its configured port"""
+        host = self.mongo.info['public-address']
+        netcat = 'nc {} {} </dev/null'
+
+        def check_port(port):
+            self.deployment.configure('mongodb', {'port': port})
+            self.deployment.sentry.wait()
+            return subprocess.call(netcat.format(host, port), shell=True)
+
+        self.assertEqual(0, check_port(55555))
+        self.assertEqual(0, check_port(27017))
+
 
 if __name__ == '__main__':
-    runner = TestDeploy()
-    runner.run()
+    unittest.main()

=== removed file 'tests/get-unit-info'
--- tests/get-unit-info	2012-01-31 01:19:12 +0000
+++ tests/get-unit-info	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-#!/usr/bin/python
-# machines:
-#   0: {dns-name: ec2-50-17-84-127.compute-1.amazonaws.com, instance-id: i-8c5c3fec}
-#   1: {dns-name: ec2-184-73-102-113.compute-1.amazonaws.com, instance-id: i-14a2c174}
-#   2: {dns-name: ec2-75-101-184-93.compute-1.amazonaws.com, instance-id: i-e0a2c180}
-# services:
-#   mysql:
-#     charm: local:mysql-11
-#     relations: {db: wordpress}
-#     units:
-#       mysql/0:
-#         machine: 2
-#         relations:
-#           db: {state: up}
-#         state: started
-#   wordpress:
-#     charm: local:wordpress-31
-#     exposed: true
-#     relations: {db: mysql}
-#     units:
-#       wordpress/0:
-#         machine: 1
-#         open-ports: []
-#         relations: {}
-#         state: null
-
-import yaml
-import sys
-from subprocess import Popen, PIPE
-
-
-def main():
-    d = yaml.safe_load(Popen(['juju','status'],stdout=PIPE).stdout)
-    srv = d.get("services", {}).get(sys.argv[1])
-    if srv is None:
-        return
-    units = srv.get("units", {})
-    if units is None:
-        return
-    item = units.items()[0][1].get(sys.argv[2])
-    if item is None:
-        return
-    print item
-
-if __name__ == "__main__":
-    main()

=== removed file 'tests/test_write_log_rotate_config.py'
--- tests/test_write_log_rotate_config.py	2014-04-11 22:00:15 +0000
+++ tests/test_write_log_rotate_config.py	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-import mock
-import os
-import unittest
-import tempfile
-import sys
-sys.path.append('hooks')
-import hooks
-
-
-class TestWriteLogrotateConfigFile(unittest.TestCase):
-
-    def test_success(self):
-        logpath = '/tmp/foo/foo.log'
-        config_data = {
-            'logpath': logpath,
-            'logrotate-frequency': 'daily',
-            'logrotate-maxsize': '5G',
-            'logrotate-rotate': 5,
-        }
-        fd, temp_fn = tempfile.mkstemp()
-        os.close(fd)
-        with mock.patch('hooks.juju_log') as mock_juju_log:
-            with mock.patch('hooks.open', create=True) as mock_open:
-                mock_open.return_value = mock.MagicMock(spec=file)
-                hooks.write_logrotate_config(config_data, temp_fn)
-                os.unlink(temp_fn)
-        mock_juju_log.assert_called_once_with('Writing {}.'.format(temp_fn))
-        mock_open.assert_called_once_with(temp_fn, 'w')
-        mock_file = mock_open().__enter__()
-        call_args = mock_file.write.call_args[0][0]
-        self.assertTrue(mock_file.write.called)
-        self.assertIn(logpath, call_args)
-        self.assertIn('daily', call_args)
-        self.assertIn('maxsize 5G', call_args)
-        self.assertIn('rotate 5', call_args)