From 5035b80537d4f6d4f4d57a3a429d12fc4ca04d54 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 23 Feb 2017 11:52:10 +0100
Subject: [8144] Remove Haproxy tests

---
 tests/server-tests/helpers/couchdb_helper.rb | 31 +---------------------------
 tests/server-tests/helpers/http_helper.rb    |  4 ++--
 tests/server-tests/white-box/mx.rb           | 10 ---------
 tests/server-tests/white-box/webapp.rb       | 10 ---------
 4 files changed, 3 insertions(+), 52 deletions(-)

(limited to 'tests')

diff --git a/tests/server-tests/helpers/couchdb_helper.rb b/tests/server-tests/helpers/couchdb_helper.rb
index efb2c2bf..0b6671ee 100644
--- a/tests/server-tests/helpers/couchdb_helper.rb
+++ b/tests/server-tests/helpers/couchdb_helper.rb
@@ -30,35 +30,6 @@ class LeapTest
     end
   end
 
-  #
-  # generates a couchdb url for accessing couchdb via haproxy
-  #
-  # example properties:
-  #
-  # haproxy:
-  #   couch:
-  #     listen_port: 4096
-  #     servers:
-  #       panda:
-  #         backup: false
-  #         host: localhost
-  #         port: 4000
-  #         weight: 100
-  #         writable: true
-  #
-  def couchdb_url_via_haproxy(path="", options=nil)
-    path = path.gsub('"', '%22')
-    if options && options[:username] && options[:password]
-      userpart = "%{username}:%{password}@" % options
-    else
-      userpart = ""
-    end
-    port = assert_property('haproxy.couch.listen_port')
-    return URLString.new("http://#{userpart}localhost:#{port}#{path}").tap { |url|
-      url.memo = '(via haproxy)'
-    }
-  end
-
   #
   # generates a couchdb url for when couchdb is running locally.
   #
@@ -140,4 +111,4 @@ class LeapTest
     end
   end
 
-end
\ No newline at end of file
+end
diff --git a/tests/server-tests/helpers/http_helper.rb b/tests/server-tests/helpers/http_helper.rb
index 0d0bb7d5..3a1df9e7 100644
--- a/tests/server-tests/helpers/http_helper.rb
+++ b/tests/server-tests/helpers/http_helper.rb
@@ -5,7 +5,7 @@ class LeapTest
   #
   # In order to easily provide detailed error messages, it is useful
   # to append a memo to a url string that details what this url is for
-  # (e.g. stunnel, haproxy, etc).
+  # (e.g. stunnel, etc).
   #
   # So, the url happens to be a UrlString, the memo field is used
   # if there is an error in assert_get.
@@ -154,4 +154,4 @@ class LeapTest
     request
   end
 
-end
\ No newline at end of file
+end
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