[tests] fix functional tests for python3

Gauvain Pocentek · Gauvain Pocentek · commit 3dc997ffba46 · 2018-05-10T15:26:05.000+02:00
Fixes #486
diff --git a/tools/python_test_v4.py b/tools/python_test_v4.py
@@ -103,9 +103,8 @@
      'name': 'Foo Bar', 'password': 'foobar_password'})
 
 assert gl.users.list(search='foobar')[0].id == foobar_user.id
-usercmp = lambda x,y: cmp(x.id, y.id)
-expected = sorted([new_user, foobar_user], cmp=usercmp)
-actual = sorted(list(gl.users.list(search='foo')), cmp=usercmp)
+expected = [new_user, foobar_user]
+actual = list(gl.users.list(search='foo'))
 assert len(expected) == len(actual)
 assert len(gl.users.list(search='asdf')) == 0
 foobar_user.bio = 'This is the user bio'
@@ -337,7 +336,7 @@
                             'content': 'Initial content',
                             'commit_message': 'Initial commit'})
 readme = admin_project.files.get(file_path='README', ref='master')
-readme.content = base64.b64encode("Improved README")
+readme.content = base64.b64encode(b"Improved README")
 time.sleep(2)
 readme.save(branch="master", commit_message="new commit")
 readme.delete(commit_message="Removing README", branch="master")
