From 8416d5772d5e14829df58dabb24b30721c302c07 Mon Sep 17 00:00:00 2001 From: Martin Basti Date: Jun 28 2017 14:26:50 +0000 Subject: py3: Remove comparison >=2 of debnug log level We have only one debug log level and it causes issues with py3. ... File "/usr/lib/python3.5/site-packages/ipaserver/rpcserver.py", line 490, in marshal response, version, pretty_print=self.api.env.debug >= 2 TypeError: unorderable types: str() >= int() https://pagure.io/freeipa/issue/4985 Reviewed-By: Stanislav Laznicka --- diff --git a/.travis.yml b/.travis.yml index 1014a5f..bcbc8e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,6 +66,7 @@ env: TEST_RUNNER_CONFIG=".test_runner_config_py3_temp.yaml" TESTS_TO_RUN="test_cmdline test_ipalib + test_ipapython test_ipaserver/test_changepw.py test_pkcs10 test_xmlrpc/test_location_plugin.py @@ -91,13 +92,6 @@ env: test_xmlrpc/test_sudorule_plugin.py" ### Tests which haven't been ported to py3 yet ### ## test_install - ## test_ipapython - # test_ipapython/test_cookie.py - # test_ipapython/test_dn.py - # test_ipapython/test_ipautil.py - # test_ipapython/test_ipavalidate.py - # test_ipapython/test_kerberos.py - # test_ipapython/test_ssh.py # test_ipaserver/httptest.py # test_ipaserver/test_dnssec.py # test_ipaserver/test_install/test_adtrustinstance.py diff --git a/ipaserver/rpcserver.py b/ipaserver/rpcserver.py index 9c5d2b9..cca774f 100644 --- a/ipaserver/rpcserver.py +++ b/ipaserver/rpcserver.py @@ -487,7 +487,7 @@ class jsonserver(WSGIExecutioner, HTTP_Status): version=unicode(VERSION), ) dump = json_encode_binary( - response, version, pretty_print=self.api.env.debug >= 2 + response, version, pretty_print=self.api.env.debug ) return dump.encode('utf-8') diff --git a/ipatests/test_ipapython/test_session_storage.py b/ipatests/test_ipapython/test_session_storage.py index 1ae9f9c..4f9091d 100644 --- a/ipatests/test_ipapython/test_session_storage.py +++ b/ipatests/test_ipapython/test_session_storage.py @@ -22,7 +22,7 @@ class test_session_storage(object): # os.environ['KRB5CCNAME'] = 'FILE:%s/ccache' % tmpdir self.principal = 'admin' self.key = 'X-IPA-test-session-storage' - self.data = 'Test Data' + self.data = b'Test Data' def test_01(self): session_storage.store_data(self.principal, self.key, self.data)