Merge branch '8144_remove_haproxy' into 'master'

8144 remove haproxy

Closes #8144

See merge request !70

2 files changed, 3 insertions, 32 deletions

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
@@ -31,35 +31,6 @@ class LeapTest
   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.
   #
   # example properties:
@@ -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