Merge lp:~nicopace/charms/trusty/varnish/all-tests into lp:charms/trusty/varnish

[nicopace]

Merge all varnish tests into one:
* Varnish wordpress test
* change port test

[Review Queue (review-queue)]

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

review: Needs Fixing (automated testing)

[nicopace (nicopace)]

Wordpress test corrected, and deployment tests extended so it works on slower platforms.

[lp:~nicopace/charms/trusty/varnish/all-tests]

19. By nicopace on 2015-03-12

Corrects time in tests, and decode on string.

[nicopace (nicopace)]

The failing test is due to a charm error.

[nicopace (nicopace)]

I published a bug with this merge: https://bugs.launchpad.net/charms/+source/varnish/+bug/1431472

=== modified file 'tests/10-deploy'
--- tests/10-deploy	2014-10-28 20:52:26 +0000
+++ tests/10-deploy	2015-03-12 17:10:52 +0000
@@ -17,7 +17,7 @@
         cls.deployment.expose('varnish')
 
         try:
-            cls.deployment.setup(timeout=900)
+            cls.deployment.setup(timeout=5000)
             cls.deployment.sentry.wait()
         except amulet.helpers.TimeoutError:
             amulet.raise_status(
 
=== added file 'tests/11-varnish-wordpress'
--- tests/11-varnish-wordpress	1970-01-01 00:00:00 +0000
+++ tests/11-varnish-wordpress	2015-03-12 17:10:52 +0000
@@ -0,0 +1,55 @@
+#!/usr/bin/env python3
+import subprocess
+
+import requests
+import amulet
+import unittest
+
+
+class TestDeployment(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls.deployment = amulet.Deployment(series='trusty')
+
+        cls.deployment.add('varnish')
+        cls.deployment.add('wordpress')
+        cls.deployment.relate('varnish:reverseproxy', 'wordpress:website')
+
+        cls.deployment.expose('varnish')
+        cls.deployment.expose('wordpress')
+
+        try:
+            cls.deployment.setup(timeout=5000)
+            cls.deployment.sentry.wait()
+        except amulet.helpers.TimeoutError:
+            amulet.raise_status(
+                amulet.SKIP, msg="Environment wasn't stood up in time")
+        except:
+            raise
+
+        cls.varnish = cls.deployment.sentry['varnish/0']
+        cls.wordpress = cls.deployment.sentry['wordpress/0']
+
+    def test_deployed(self):
+        result_header_varnish = subprocess.check_output([
+            'curl', '-o -', '-I',
+            ' H "Host: %s"' % self.wordpress.info['public-address'],
+            'http://%s/' % self.varnish.info['public-address']])
+
+        if 'varnish' not in result_header_varnish.decode('utf-8'):
+            amulet.raise_status(
+                amulet.FAIL, msg="Varnish is not in the middle.")
+
+        result_varnish = requests.get(
+            'http://%s/' % self.varnish.info['public-address'])
+        result_wordpress = requests.get(
+            'http://%s/' % self.wordpress.info['public-address'])
+
+        if result_varnish.content != result_wordpress.content:
+            amulet.raise_status(
+                amulet.FAIL,
+                msg="Varnish is returning differnt content than wordpress.")
+
+
+if __name__ == '__main__':
+    unittest.main()
 
=== added file 'tests/12-change-port'
--- tests/12-change-port	1970-01-01 00:00:00 +0000
+++ tests/12-change-port	2015-03-12 17:10:52 +0000
@@ -0,0 +1,43 @@
+#!/usr/bin/env python3
+
+import amulet
+import unittest
+
+
+class TestDeployment(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls.deployment = amulet.Deployment(series='trusty')
+
+        cls.deployment.add('varnish')
+        cls.deployment.add('wordpress')
+        cls.deployment.relate('varnish:reverseproxy', 'wordpress:website')
+
+        cls.deployment.configure('varnish', {
+            'port': 8080
+        })
+
+        cls.deployment.expose('varnish')
+        cls.deployment.expose('wordpress')
+
+        try:
+            cls.deployment.setup(timeout=5000)
+            cls.deployment.sentry.wait()
+        except amulet.helpers.TimeoutError:
+            amulet.raise_status(
+                amulet.SKIP, msg="Environment wasn't stood up in time")
+        except:
+            raise
+
+        cls.varnish = cls.deployment.sentry['varnish/0']
+        cls.wordpress = cls.deployment.sentry['wordpress/0']
+
+    def test_deployed(self):
+        result, code = self.varnish.run('sudo netstat -plnt | grep 8080')
+        if result == '':
+            amulet.raise_status(amulet.FAIL,
+                                msg='change port failed.')
+
+
+if __name__ == '__main__':
+    unittest.main()