Merge lp:~johnsca/charms/trusty/ethercalc/rq into lp:~joe/charms/trusty/ethercalc/trunk

[Cory Johns]

Fixes for test and website-relation

[Joe Liau (joe)]

Thank you, Cory.

review: Approve (merge)

=== modified file 'hooks/website-relation-joined'
--- hooks/website-relation-joined	2015-09-27 02:39:25 +0000
+++ hooks/website-relation-joined	2015-10-29 15:23:50 +0000
@@ -7,6 +7,6 @@
 juju-log "${JUJU_UNIT_NAME} website-relation-joined started."
 
 address=`unit-get private-address`
-relation-set hostname=${address}
+relation-set hostname=${address} port=8000
 
 juju-log "${JUJU_UNIT_NAME} website-relation-joined complete."
 
=== modified file 'tests/10-deploy'
--- tests/10-deploy	2015-09-27 02:39:25 +0000
+++ tests/10-deploy	2015-10-29 15:23:50 +0000
@@ -20,9 +20,9 @@
             amulet.raise_status(amulet.SKIP, msg="Environment wasn't stood up in time")
         except:
             raise
-        cls.unit = cls.deployment.sentry.unit['ethercalc/0']
+        cls.ethercalc_unit = cls.deployment.sentry['ethercalc'][0]
 
-      def test_website(self):
+    def test_website(self):
         ''' Test that ethercalc responds to HTTP get requests. '''
         # Get the address for ethercalc.
         server = self.ethercalc_unit.info['public-address']
@@ -34,17 +34,6 @@
         if 'EtherCalc' not in str(response.content):
             message = 'EtherCalc was not in the HTTP response from {0}'
             amulet.raise_status(amulet.FAIL, msg=message.format(url))
-        # Get the address for haproxy.
-        server = self.haproxy_unit.info['public-address']
-        port = '80'
-        # Create a URL to the haproxy unit
-        url = 'http://{0}:{1}'.format(server, port)
-        response = requests.get(url)
-        response.raise_for_status()
-        if 'EtherCalc' not in str(response.content):
-            message = 'EtherCalc was not in the HTTP response from {0}'
-            amulet.raise_status(amulet.FAIL, msg=message.format(url))
-        pass
 
 
 if __name__ == '__main__':