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

[Cory Johns]

[nicopace (nicopace)]

review: Approve

=== modified file 'tests/11-scale-elastic-query.json'
--- tests/11-scale-elastic-query.json	2015-02-25 15:57:46 +0000
+++ tests/11-scale-elastic-query.json	2015-03-12 18:49:17 +0000
@@ -42,7 +42,7 @@
     {
     "_score": {
       "order": "desc",
-      "ignore_unmapped": True
+      "ignore_unmapped": true
     }
   }
   ]

=== modified file 'tests/11-scale-elastic.py'
--- tests/11-scale-elastic.py	2015-02-25 15:57:46 +0000
+++ tests/11-scale-elastic.py	2015-03-12 18:49:17 +0000
@@ -1,4 +1,5 @@
 #!/usr/bin/python3
+import os
 import sys
 import time
 import json
@@ -50,11 +51,14 @@
     time.sleep(3)
 
     url = 'http://%s/_all/_search' % kibana_unit.info['public-address']
-    r = requests.get(url,
-                     data=json.load(open('11-scale-elastic-query.json')))
+    test_dir = os.path.dirname(__file__)
+    test_data_file = os.path.join(test_dir, '11-scale-elastic-query.json')
+    with open(test_data_file) as fp:
+        test_data = json.load(fp)
+    r = requests.get(url, params=test_data)
     if not r.ok:
         amulet.raise_status(amulet.FAIL,
-                            msg="Error connecting.")
+                            msg="Error performing search.")
     try:
         result = r.json()
         if result['hits']['total'] != 1: