Merge lp:~brad-marshall/charms/precise/bip/add-amulet-tests into lp:charms/bip

[Brad Marshall]

Add some basic amulet tests to confirm bip is running, and the port is open. Any extra testing ideas would be great.

I've done some basic testing with trusty and would like to see the charm promulgated to trusty if possible.

Fixed the error reporting on the socket connection testing.

[lp:~brad-marshall/charms/precise/bip/add-amulet-tests]

18. By Tim Van Steenburgh on 2014-11-19

[brad-marshall] Added config options for backlog

19. By Tim Van Steenburgh on 2014-11-19

[mbruzek] Added tests

[Review Queue (review-queue)]

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-10340-results

review: Needs Fixing (automated testing)

[Cory Johns (johnsca)]

Brad,

Thanks for adding these tests! It looks like the "failure" reported above is due to a merge conflict between this test and the boilerplate test added in revision #19 [1]. However, these tests are clearly superior, and it should be an easy merge to discard the tests from upstream in favor of these.

However, when running these tests, I found that the backlog changes merged in with revision #18 [2] did not include the variables in the template context, resulting in a broken bip.conf file.

Before approving this, could you please resolve the merge conflict and add the two variables (backlog_lines and backlog_msg_only) to the template context so that the tests can pass?

[1]: http://bazaar.launchpad.net/~charmers/charms/precise/bip/trunk/revision/19
[2]: http://bazaar.launchpad.net/~charmers/charms/precise/bip/trunk/revision/18

review: Needs Fixing

[lp:~brad-marshall/charms/precise/bip/add-amulet-tests]

20. By Brad Marshall on 2014-12-12

[bradm] Fixed merge conflict from existing tests dir

[Brad Marshall (brad-marshall)]

I've fixed the merge request to not conflict, please let me know if there's any other issues.

[José Antonio Rey (jose)]

Hey Brad,

I have just reviewied the addition of these tests. They all pass. Tested with bundletester under EC2. No merge conflicts, everything seems to be in order now.

+1!

Thanks for working on these, greatly appreciated!

review: Approve

=== added directory 'tests'
=== removed directory 'tests'
=== added file 'tests/00-setup'
--- tests/00-setup	1970-01-01 00:00:00 +0000
+++ tests/00-setup	2014-12-12 03:10:58 +0000
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+sudo add-apt-repository ppa:juju/stable -y
+sudo apt-get update
+sudo apt-get install amulet -y
 
=== removed file 'tests/00-setup'
--- tests/00-setup	2014-11-06 16:22:56 +0000
+++ tests/00-setup	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-sudo add-apt-repository ppa:juju/stable -y
-sudo apt-get update
-sudo apt-get install amulet python3-requests -y
 
=== added file 'tests/10-deploy'
--- tests/10-deploy	1970-01-01 00:00:00 +0000
+++ tests/10-deploy	2014-12-12 03:10:58 +0000
@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+
+import amulet
+import socket
+import unittest
+
+class TestDeployment(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls.deployment = amulet.Deployment()
+
+        cls.deployment.add('bip')
+        cls.deployment.expose('bip')
+
+        try:
+            cls.deployment.setup(timeout=900, cleanup=False)
+            cls.deployment.sentry.wait()
+        except amulet.helpers.TimeoutError:
+            amulet.raise_status(amulet.SKIP, msg="Environment wasn't stood up in time")
+        except:
+            raise
+
+        cls.unit = cls.deployment.sentry.unit['bip/0']
+        cls.ipaddr = cls.unit.info['public-address']
+        cls.ports = cls.unit.info['open-ports']
+
+    def test_1_check_running(self):
+        output = self.unit.run('service bip status')
+        service_active = 'bip is running' in str(output)
+        if service_active:
+            print("Found running bip on %s" % self.ipaddr)
+            #amulet.raise_status(amulet.PASS, msg=message)
+        else:
+            message = "Failed to find running bip"
+            amulet.raise_status(amulet.FAIL, msg=message)
+
+    def test_2_check_port_open(self):
+        s = socket.socket()
+        for p in self.ports:
+            (port, proto) = p.split("/")
+            try:
+                s.connect((self.ipaddr, int(port)))
+                message = "Connect to %s on port %s succeeded" % (self.ipaddr, port)
+                #amulet.raise_status(amulet.PASS, msg=message)
+                print(message)
+            except socket.error as e:
+                message = "Connection to %s on port %s failed: %s" % (self.ipaddr, port, e)
+                amulet.raise_status(amulet.FAIL, msg=message)
+
+
+if __name__ == '__main__':
+    unittest.main()
 
=== removed file 'tests/99-autogen'
--- tests/99-autogen	2014-11-06 16:22:56 +0000
+++ tests/99-autogen	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-#!/usr/bin/env python3
-
-import amulet
-import requests
-import unittest
-
-
-class TestDeployment(unittest.TestCase):
-    @classmethod
-    def setUpClass(cls):
-        cls.deployment = amulet.Deployment(series='precise')
-
-        cls.deployment.add('bip')
-
-        try:
-            cls.deployment.setup(timeout=900)
-            cls.deployment.sentry.wait()
-        except amulet.helpers.TimeoutError:
-            amulet.raise_status(amulet.SKIP, msg="Environment wasn't stood up in time")
-        except:
-            raise
-
-    def test_case(self):
-        # Now you can use self.deployment.sentry.unit[UNIT] to address each of
-        # the units and perform more in-depth steps.  You can also reference
-        # the first unit as self.unit.
-        # There are three test statuses that can be triggered with
-        # amulet.raise_status():
-        #   - amulet.PASS
-        #   - amulet.FAIL
-        #   - amulet.SKIP
-        # Each unit has the following methods:
-        #   - .info - An array of the information of that unit from Juju
-        #   - .file(PATH) - Get the details of a file on that unit
-        #   - .file_contents(PATH) - Get plain text output of PATH file from that unit
-        #   - .directory(PATH) - Get details of directory
-        #   - .directory_contents(PATH) - List files and folders in PATH on that unit
-        #   - .relation(relation, service:rel) - Get relation data from return service
-        #          add tests here to confirm service is up and working properly
-        # For example, to confirm that it has a functioning HTTP server:
-        #     page = requests.get('http://{}'.format(self.unit.info['public-address']))
-        #     page.raise_for_status()
-        # More information on writing Amulet tests can be found at:
-        #     https://juju.ubuntu.com/docs/tools-amulet.html
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()