Fixed get response body decode error for py2

Author: surenderraju

src/HttpLibrary/__init__.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 from future import standard_library
 standard_library.install_aliases()
-from builtins import object
+from builtins import object, str
 from robot.api import logger
 
 from base64 import b64encode
@@ -486,8 +486,14 @@ def get_response_body(self):
         | Should Start With   | ${body}           | <?xml version="1.0" encoding="UTF-8" |
         """
         response_body = self.response.body
+
+        # In python2 response comes as str, which satisfies below bytes condition too and fails at decode call.
+        if isinstance(response_body, str):
+            return response_body
+
         if isinstance(response_body, bytes):
-            response_body = response_body.decode()
+            response_body = response_body.decode('utf-8', 'replace')
+
         return response_body
 
     def response_body_should_contain(self, should_contain):
@@ -499,12 +505,13 @@ def response_body_should_contain(self, should_contain):
         | Response Body Should Contain | version="1.0"    |
         | Response Body Should Contain | encoding="UTF-8" |
         """
-        logger.debug('Testing whether "%s" contains "%s".' % (
-            self.response.body, should_contain))
 
         response = self.response.body
         if isinstance(response, bytes):
-            response = response.decode("utf-8")
+            response = response.decode("utf-8", "replace")
+
+        logger.debug('Testing whether "%s" contains "%s".' % (response, should_contain))
+
         assert should_contain in response, \
             '"%s" should have contained "%s", but did not.' % (
                 self.response.body, should_contain)

src/HttpLibrary/livetest.py

@@ -41,14 +41,13 @@
 __author__ = '[email protected]'
 __version__ = '0.5'
 
-import sys, os
+import sys
 import webtest
 import ssl
 import http.client
 import urllib.parse
 from http.cookies import BaseCookie, CookieError
 from six.moves import http_cookiejar
-from robot.api import logger
 
 
 conn_classes = {'http': http.client.HTTPConnection,

tests/http/simple.txt

@@ -168,12 +168,24 @@ POST with one word request body
     POST                          /echo
     Response Body Should Contain  Tooot
 
+POST with extended ascii chars request body
+    Set Request Body              ToootÄß
+    Set Request Header            Content-Type    text/plain
+    POST                          /echo
+    Response Body Should Contain  ToootÄß
+
 PUT with two word request body
     Set Request Body              Tooot Tooooot
     Set Request Header            Content-Type    text/plain
     PUT                           /echo
     Response Body Should Contain  Tooot Tooooot
 
+PUT with two word extended ascii chars request body
+    Set Request Body              ToootÖÜ ToooootÄß
+    Set Request Header            Content-Type    text/plain
+    PUT                           /echo
+    Response Body Should Contain  ToootÖÜ ToooootÄß
+
 Get Response Status
     GET                          /200
     ${status}=                   Get Response Status

tox.ini

@@ -2,14 +2,10 @@
 envlist = py27, py36
 
 [testenv]
-whitelist_externals = make
-
-[testenv:py36]
-commands=
-    make buildout-development-py3
-    make run-robotframework
-
-[testenv:py27]
-commands=
-    make buildout-development-py2
-    make run-robotframework
+commands =
+    {envbindir}/python bootstrap.py
+    {envbindir}/buildout
+    {toxinidir}/bin/robotframework tests
+deps =
+    zc.buildout
+skip_install = true