summaryrefslogtreecommitdiff
path: root/tests/server-tests/white-box
diff options
context:
space:
mode:
authorVarac <varac@leap.se>2017-03-15 18:25:41 +0000
committerVarac <varac@leap.se>2017-03-15 18:25:41 +0000
commit8b9cf218766e0075102db09562293835ab73f432 (patch)
tree67ef14ec1748ce68bc9751d2fa0d2a1bf9baf7f1 /tests/server-tests/white-box
parente4a2d54b3571a8f4ce46485db762acbc4b919d84 (diff)
parent8c1c4c102936dd779c74d615763e7adef7033ec1 (diff)
Merge branch '8144_remove_haproxy' into 'master'
8144 remove haproxy Closes #8144 See merge request !70
Diffstat (limited to 'tests/server-tests/white-box')
-rw-r--r--tests/server-tests/white-box/mx.rb10
-rw-r--r--tests/server-tests/white-box/webapp.rb10
2 files changed, 0 insertions, 20 deletions
diff --git a/tests/server-tests/white-box/mx.rb b/tests/server-tests/white-box/mx.rb
index 432f4e54..dfad0eed 100644
--- a/tests/server-tests/white-box/mx.rb
+++ b/tests/server-tests/white-box/mx.rb
@@ -24,16 +24,6 @@ class Mx < LeapTest
pass
end
- def test_02_Can_contact_couchdb_via_haproxy?
- if property('haproxy.couch')
- url = couchdb_url_via_haproxy("", couch_url_options)
- assert_get(url) do |body|
- assert_match /"couchdb":"Welcome"/, body, "Request to #{url} should return couchdb welcome message."
- end
- pass
- end
- end
-
#
# this test picks a random identity document, then queries
# using the by_address view for that same document again.
diff --git a/tests/server-tests/white-box/webapp.rb b/tests/server-tests/white-box/webapp.rb
index e48df524..b1ceddb1 100644
--- a/tests/server-tests/white-box/webapp.rb
+++ b/tests/server-tests/white-box/webapp.rb
@@ -16,16 +16,6 @@ class Webapp < LeapTest
pass
end
- def test_02_Can_contact_couchdb_via_haproxy?
- if property('haproxy.couch')
- url = couchdb_url_via_haproxy("", url_options)
- assert_get(url) do |body|
- assert_match /"couchdb":"Welcome"/, body, "Request to #{url} should return couchdb welcome message."
- end
- pass
- end
- end
-
def test_03_Are_daemons_running?
assert_running match: '^/usr/sbin/apache2'
assert_running match: 'ruby /usr/bin/nickserver'