From 902f736a2b288fac5d080b7f146f6a8b16f882f1 Mon Sep 17 00:00:00 2001
From: Martin Basti <mbasti@redhat.com>
Date: Jun 28 2017 14:26:50 +0000
Subject: py3: test_otptoken_import: fix bytes usage


https://pagure.io/freeipa/issue/4985

Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>

---

diff --git a/.travis.yml b/.travis.yml
index bcbc8e2..ec2e41a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -67,7 +67,7 @@ env:
           TESTS_TO_RUN="test_cmdline
                 test_ipalib
                 test_ipapython
-                test_ipaserver/test_changepw.py
+                test_ipaserver
                 test_pkcs10
                 test_xmlrpc/test_location_plugin.py
                 test_xmlrpc/test_nesting.py
@@ -91,21 +91,6 @@ env:
                 test_xmlrpc/test_sudocmdgroup_plugin.py
                 test_xmlrpc/test_sudorule_plugin.py"
             ### Tests which haven't been ported to py3 yet ###
-            ## test_install
-            # test_ipaserver/httptest.py
-            # test_ipaserver/test_dnssec.py
-            # test_ipaserver/test_install/test_adtrustinstance.py
-            # test_ipaserver/test_install/test_service.py
-            # test_ipaserver/test_ipap11helper.py
-            # test_ipaserver/test_kadmin.py
-            # test_ipaserver/test_ldap.py
-            # test_ipaserver/test_otptoken_import.py
-            # test_ipaserver/test_rpcserver.py
-            # test_ipaserver/test_secrets.py
-            # test_ipaserver/test_serverroles.py
-            # test_ipaserver/test_topology_plugin.py
-            # test_ipaserver/test_version_comparison.py
-            ## test_ipaserver
             ## test_xmlrpc/test_[l-z]*.py
             # test_xmlrpc/test_range_plugin.py
             # test_xmlrpc/test_trust_plugin.py
diff --git a/ipatests/test_ipaserver/test_otptoken_import.py b/ipatests/test_ipaserver/test_otptoken_import.py
index 43b3349..8835367 100644
--- a/ipatests/test_ipaserver/test_otptoken_import.py
+++ b/ipatests/test_ipaserver/test_otptoken_import.py
@@ -76,7 +76,7 @@ class test_otptoken_import(object):
     def test_figure7(self):
         doc = PSKCDocument(os.path.join(basename, "pskc-figure7.xml"))
         assert doc.keyname == 'My Password 1'
-        doc.setKey('qwerty')
+        doc.setKey(b'qwerty')
         assert [(t.id, t.options) for t in doc.getKeyPackages()] == \
             [(u'123456', {
                 'ipatokenotpkey': u'GEZDGNBVGY3TQOJQGEZDGNBVGY3TQOJQ',