Merge lp:~asanjar/charms/trusty/zulu8/trunk into lp:~azulcharmers/charms/trusty/zulu8/trunk

Proposed by amir sanjar
Status: Merged
Approved by: Dmitriy Kozorez
Approved revision: 10
Merged at revision: 10
Proposed branch: lp:~asanjar/charms/trusty/zulu8/trunk
Merge into: lp:~azulcharmers/charms/trusty/zulu8/trunk
Diff against target: 46 lines (+34/-2)
2 files modified
tests/00-setup (+4/-2)
tests/10-deploy.py (+30/-0)
To merge this branch: bzr merge lp:~asanjar/charms/trusty/zulu8/trunk
Reviewer Review Type Date Requested Status
Dmitriy Kozorez Approve
Review via email: mp+269397@code.launchpad.net

Description of the change

adding amulet test

To post a comment you must log in.
Revision history for this message
Dmitriy Kozorez (dmitriy-kozorez) wrote :

looks good to me

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/00-setup'
2--- tests/00-setup 2015-08-12 15:58:21 +0000
3+++ tests/00-setup 2015-08-27 15:53:38 +0000
4@@ -1,3 +1,5 @@
5 #!/bin/bash
6-set -e
7-java -version 2>&1 | grep -iqe "zulu" && juju-log "Zulu is used as defauls java" || juju-log "Zulu isn't used as default java" && exit 1
8+
9+sudo add-apt-repository ppa:juju/stable -y
10+sudo apt-get update
11+sudo apt-get install amulet -y
12
13=== added file 'tests/10-deploy.py'
14--- tests/10-deploy.py 1970-01-01 00:00:00 +0000
15+++ tests/10-deploy.py 2015-08-27 15:53:38 +0000
16@@ -0,0 +1,30 @@
17+#!/usr/bin/python
18+
19+import amulet
20+import unittest
21+
22+
23+class TestDeployment(unittest.TestCase):
24+ @classmethod
25+ def setUpClass(cls):
26+ cls.deployment = amulet.Deployment(series='trusty')
27+ cls.deployment.add('zulu8')
28+ cls.deployment.add('ubuntu')
29+ cls.deployment.relate('zulu8:default', 'ubuntu:juju-info')
30+ try:
31+ cls.deployment.setup(timeout=900)
32+ cls.deployment.sentry.wait()
33+ except amulet.helpers.TimeoutError:
34+ msg = "Environment wasn't stood up in time"
35+ amulet.raise_status(amulet.SKIP, msg=msg)
36+ except:
37+ raise
38+
39+ def test_single_service(self):
40+ o, c = self.deployment.sentry['ubuntu/0'].run('java -version 2>&1 | grep -iqe "zulu"')
41+ assert c == 0, "Zulu8 not active"
42+
43+
44+
45+if __name__ == '__main__':
46+ unittest.main()

Subscribers

People subscribed via source and target branches