From 5035b80537d4f6d4f4d57a3a429d12fc4ca04d54 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 23 Feb 2017 11:52:10 +0100 Subject: [8144] Remove Haproxy tests --- tests/server-tests/white-box/mx.rb | 10 ---------- tests/server-tests/white-box/webapp.rb | 10 ---------- 2 files changed, 20 deletions(-) (limited to 'tests/server-tests/white-box') 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' -- cgit v1.2.3