summaryrefslogtreecommitdiff
path: root/tests/white-box
diff options
context:
space:
mode:
Diffstat (limited to 'tests/white-box')
-rw-r--r--tests/white-box/couchdb.rb10
-rw-r--r--tests/white-box/webapp.rb15
2 files changed, 14 insertions, 11 deletions
diff --git a/tests/white-box/couchdb.rb b/tests/white-box/couchdb.rb
index 74bd47bf..6d3a7452 100644
--- a/tests/white-box/couchdb.rb
+++ b/tests/white-box/couchdb.rb
@@ -71,7 +71,7 @@ class CouchDB < LeapTest
def test_04_Do_ACL_users_exist?
acl_users = ['_design/_auth', 'leap_mx', 'nickserver', 'soledad', 'tapicero', 'webapp', 'replication']
- url = couchdb_backend_url("/_users/_all_docs")
+ url = couchdb_backend_url("/_users/_all_docs", :user => 'admin')
assert_get(url) do |body|
response = JSON.parse(body)
assert_equal acl_users.count, response['total_rows']
@@ -84,7 +84,8 @@ class CouchDB < LeapTest
def test_05_Do_required_databases_exist?
dbs_that_should_exist = ["customers","identities","keycache","sessions","shared","tickets","tokens","users"]
dbs_that_should_exist.each do |db_name|
- assert_get(couchdb_url("/"+db_name)) do |body|
+ url = couchdb_url("/"+db_name, :user => 'admin')
+ assert_get(url) do |body|
assert response = JSON.parse(body)
assert_equal db_name, response['db_name']
end
@@ -129,9 +130,10 @@ class CouchDB < LeapTest
url
end
- def couchdb_backend_url(path="")
+ def couchdb_backend_url(path="", options={})
# TODO: admin port is hardcoded for now but should be configurable.
- couchdb_url(path, multimaster? && "5986")
+ options = {port: multimaster? && "5986"}.merge options
+ couchdb_url(path, options)
end
def multimaster?
diff --git a/tests/white-box/webapp.rb b/tests/white-box/webapp.rb
index 05b86a41..7df57fd7 100644
--- a/tests/white-box/webapp.rb
+++ b/tests/white-box/webapp.rb
@@ -14,15 +14,16 @@ class Webapp < LeapTest
# example properties:
#
# stunnel:
- # couch_client:
- # couch1_5984:
- # accept_port: 4000
- # connect: couch1.bitmask.i
- # connect_port: 15984
+ # clients:
+ # couch_client:
+ # couch1_5984:
+ # accept_port: 4000
+ # connect: couch1.bitmask.i
+ # connect_port: 15984
#
def test_01_Can_contact_couchdb?
- assert_property('stunnel.couch_client')
- $node['stunnel']['couch_client'].values.each do |stunnel_conf|
+ assert_property('stunnel.clients.couch_client')
+ $node['stunnel']['clients']['couch_client'].values.each do |stunnel_conf|
assert port = stunnel_conf['accept_port'], 'Field `accept_port` must be present in `stunnel` property.'
local_stunnel_url = "http://localhost:#{port}"
remote_ip_address = TCPSocket.gethostbyname(stunnel_conf['connect']).last