From efa91e127ab9d3a668fb0402a2c1fc8719000ade Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn@redhat.com>
Date: Mar 03 2018 11:46:57 +0000
Subject: intg: Convert output of executed commands to strings


We know that all our tested utilities (sssctl, sss_cache, sss_override)
returns strings and not binary data. We can safely encode output to
string (unicode) in python3

Reviewed-by: Martin Basti <mbasti@redhat.com>
(cherry picked from commit 69f6b919be962b8be78320ffab8607b8d9a0e4c6)
(cherry picked from commit d2778a61d3f190c5349f37377f3399fd4ed15652)

---

diff --git a/src/tests/intg/ldap_local_override_test.py b/src/tests/intg/ldap_local_override_test.py
index 714268f..d78f3cc 100644
--- a/src/tests/intg/ldap_local_override_test.py
+++ b/src/tests/intg/ldap_local_override_test.py
@@ -586,11 +586,12 @@ def env_show_user_override(request, ldap_conn,
 
 def test_show_user_override(ldap_conn, env_show_user_override):
 
-    out = check_output(['sss_override', 'user-show', 'user1'])
+    out = check_output(['sss_override', 'user-show', 'user1']).decode('utf-8')
     assert out == "user1@LDAP:ov_user1:10010:20010:Overriden User 1:"\
                   "/home/ov/user1:/bin/ov_user1_shell:\n"
 
-    out = check_output(['sss_override', 'user-show', 'user2@LDAP'])
+    out = check_output(['sss_override', 'user-show',
+                        'user2@LDAP']).decode('utf-8')
     assert out == "user2@LDAP:ov_user2:10020:20020:Overriden User 2:"\
                   "/home/ov/user2:/bin/ov_user2_shell:\n"
 
@@ -612,7 +613,7 @@ def env_find_user_override(request, ldap_conn,
 
 def test_find_user_override(ldap_conn, env_find_user_override):
 
-    out = check_output(['sss_override', 'user-find'])
+    out = check_output(['sss_override', 'user-find']).decode('utf-8')
 
     # Expected override of users
     exp_usr_ovrd = ['user1@LDAP:ov_user1:10010:20010:Overriden User 1:'
@@ -624,7 +625,7 @@ def test_find_user_override(ldap_conn, env_find_user_override):
 
     out = check_output(['sss_override', 'user-find', '--domain=LDAP'])
 
-    assert set(out.splitlines()) == set(exp_usr_ovrd)
+    assert set(out.decode('utf-8').splitlines()) == set(exp_usr_ovrd)
 
     # Unexpected parameter is reported
     ret = subprocess.call(['sss_override', 'user-find', 'PARAM'])