Client: handle trailing slashs

eplaut · Jun 26, 2016 · bc8d99e · bc8d99e
1 parent 195cd7b
commit bc8d99e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/butler/__version__.py b/butler/__version__.py
@@ -1 +1 @@
-__version__ = '0.2.1'  # pragma: no cover
+__version__ = '0.2.2'  # pragma: no cover
diff --git a/butler/client.py b/butler/client.py
@@ -13,7 +13,7 @@ def __init__(self, butler, url):
 
         :param server: Butler instance
         """
-        self.url = url
+        self.url = url.rstrip('/')
         self.butler = butler
         self.functions = {}
         self.session = requests.Session()

diff --git a/butler/server.py b/butler/server.py
@@ -24,6 +24,7 @@ def __init__(self, butler, url):
         self._app = Flask(__name__)
 
         # register functions to app routes
+        self.butler = butler
         self.functions = butler.functions
         self._register_urls()
 

diff --git a/tests/test_client.py b/tests/test_client.py
@@ -32,3 +32,11 @@ def test_client_not_exits_function(butler_client):
 def test_client_unsupported_function(butler_client):
     with slash.assert_raises(AttributeError):
         butler_client.init_functions()
+
+def test_client_rstrip_url(butler_client):
+    r = butler_client.get_test_get()
+    assert r.status_code == 200
+
+    new_butler_client = butler_client.butler.Client('http://localhost:8888/')
+    r = new_butler_client.get_test_get()
+    assert r.status_code == 200