[mariosplivalo, r=niedbalski] Upgrades charmhelpers, and adds contrib.hahelpers.cluster, make lint fixes.

3 files changed, 40 insertions, 0 deletions

diff --git a/tests/01_deploy_single.py b/tests/01_deploy_single.py
new file mode 100755
index 0000000..e9afd6a
--- /dev/null
+++ b/tests/01_deploy_single.py
@@ -0,0 +1,40 @@
+#!/usr/bin/env python3
+
+import amulet
+from pymongo import MongoClient
+
+seconds = 900
+
+d = amulet.Deployment(series='trusty')
+d.add('mongodb', charm='mongodb')
+d.expose('mongodb')
+
+# Perform the setup for the deployment.
+try:
+ d.setup(seconds)
+ d.sentry.wait(seconds)
+except amulet.helpers.TimeoutError:
+ message = 'The environment did not setup in %d seconds.', seconds
+ amulet.raise_status(amulet.SKIP, msg=message)
+except:
+ raise
+
+
+############################################################
+# Validate connectivity from $WORLD
+#############################################################
+def validate_world_connectivity():
+ client = MongoClient(d.sentry.unit['mongodb/0'].info['public-address'])
+
+ db = client['test']
+ # Can we successfully insert?
+ insert_id = db.amulet.insert({'assert': True})
+ if insert_id is None:
+ amulet.raise_status(amulet.FAIL, msg="Failed to insert test data")
+ # Can we delete from a shard using the Mongos hub?
+ result = db.amulet.remove(insert_id)
+ if result['err'] is not None:
+ amulet.raise_status(amulet.FAIL, msg="Failed to remove test data")
+
+
+validate_world_connectivity()
diff --git a/tests/01_deploy_test.py b/tests/02_deploy_shard_test.py
index b32c687..b32c687 100755
--- a/tests/01_deploy_test.py
+++ b/tests/02_deploy_shard_test.py
diff --git a/tests/02_relate_ceilometer_test.py b/tests/50_relate_ceilometer_test.py
index b5ff2e5..b5ff2e5 100755
--- a/tests/02_relate_ceilometer_test.py
+++ b/tests/50_relate_ceilometer_test.py