macaroonbakery/tests: account for python2

Exposing the error as-is requires handling of byte notation between Python 2 and 3 and strings when asserting. Signed-off-by: Sergio Schvezov <[email protected]>
petrutlucian94 · Mar 31, 2021 · 388d39e · 388d39e
1 parent d139153
commit 388d39e
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/macaroonbakery/tests/test_client.py b/macaroonbakery/tests/test_client.py
@@ -3,6 +3,7 @@
 import base64
 import datetime
 import json
+import platform
 import threading
 
 import macaroonbakery.bakery as bakery
@@ -555,9 +556,14 @@ def handler(*args):
                             httpd.server_address[1]),
                         cookies=client.cookies,
                         auth=client.auth())
-                self.assertEquals(str(discharge_error.exception),
-                                  'third party refused dischargex: unexpected response: '
-                                  "[503] b'bad system'")
+                if platform.python_version_tuple()[0] == '2':
+                    self.assertEquals(str(discharge_error.exception),
+                                      'third party refused dischargex: unexpected response: '
+                                      "[503] 'bad system'")
+                else:
+                    self.assertEquals(str(discharge_error.exception),
+                                      'third party refused dischargex: unexpected response: '
+                                      "[503] b'bad system'")
 
         finally:
             httpd.shutdown()