diff --git a/coriolis/osmorphing/netpreserver/interfaces.py b/coriolis/osmorphing/netpreserver/interfaces.py index 19fbae985..5c5ebf888 100644 --- a/coriolis/osmorphing/netpreserver/interfaces.py +++ b/coriolis/osmorphing/netpreserver/interfaces.py @@ -31,7 +31,7 @@ def _parse_iface_file(interface_file): curr_ip_address = None curr_iface = None interfaces_contents = self.osmorphing_tool._read_file_sudo( - interface_file).decode() + interface_file) LOG.debug( "Fetched %s contents: %s", interface_file, interfaces_contents) for line in interfaces_contents.splitlines(): diff --git a/coriolis/tests/osmorphing/netpreserver/test_interfaces.py b/coriolis/tests/osmorphing/netpreserver/test_interfaces.py index 5ede0fa63..2366547f6 100644 --- a/coriolis/tests/osmorphing/netpreserver/test_interfaces.py +++ b/coriolis/tests/osmorphing/netpreserver/test_interfaces.py @@ -69,7 +69,7 @@ def test_parse_network_basic(self, mock_test_path, mock_exec_cmd_chroot, "iface eth1 inet dhcp\n" "address 192.168.1.20/24\n" ) - mock_read_file_sudo.return_value = interfaces_content.encode() + mock_read_file_sudo.return_value = interfaces_content mock_test_path.return_value = True mock_exec_cmd_chroot.return_value = "" @@ -109,7 +109,7 @@ def test_parse_network_with_source(self, mock_test_path, mock_test_path.return_value = True mock_exec_cmd_chroot.return_value = extra_file mock_read_file_sudo.side_effect = ( - main_content.encode(), extra_content.encode() + main_content, extra_content ) self.netpreserver.parse_network() @@ -136,7 +136,7 @@ def test_parse_network_with_trailing_hwaddress(self, mock_test_path, interfaces_content = ( "hwaddress ether 00:11:22:33:44:55\n" ) - mock_read_file_sudo.return_value = interfaces_content.encode() + mock_read_file_sudo.return_value = interfaces_content mock_test_path.return_value = True mock_exec_cmd_chroot.return_value = ""