tests: fixed all tests for python3 BIG changes

rhodecode/apps/ssh_support/tests/conftest.py

@@ -35,7 +35,7 @@ def dummy_conf_file(tmpdir):
     conf.set('app:main', 'ssh.executable.svn', '/usr/bin/svnserve')
 
     f_path = os.path.join(str(tmpdir), 'ssh_wrapper_test.ini')
-    with open(f_path, 'wb') as f:
+    with open(f_path, 'wt') as f:
         conf.write(f)
 
     return os.path.join(f_path)

rhodecode/apps/ssh_support/tests/test_server_git.py

@@ -18,7 +18,6 @@
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
-import json
 import os
 
 import mock
@@ -26,7 +25,7 @@ import pytest
 
 from rhodecode.apps.ssh_support.lib.backends.git import GitServer
 from rhodecode.apps.ssh_support.tests.conftest import plain_dummy_env, plain_dummy_user
-
+from rhodecode.lib.ext_json import json
 
 class GitServerCreator(object):
     root = '/tmp/repo/path/'