Updated: [rhinstaller/anaconda/pulls/188 master] Fix the dd_test for python3.

[dashea]

The return of check_output is bytes now.

[master 1/2] Fix the dd_test for python3.

[dashea]

From: David Shea

The return of check_output is bytes now.
---
 tests/dd_tests/dd_test.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/dd_tests/dd_test.py b/tests/dd_tests/dd_test.py
index 60ff6b4..7fac060 100644
--- a/tests/dd_tests/dd_test.py
+++ b/tests/dd_tests/dd_test.py
@@ -22,13 +22,13 @@
 def dd_list(dd_path, kernel_ver, anaconda_ver):
     out = subprocess.check_output([os.path.join(UTILDIR, "dd_list"),
             '-d', dd_path, '-k', kernel_ver, '-a', anaconda_ver],
-            stderr=open('/dev/null'))
+            stderr=open('/dev/null')).decode('utf-8')
     return [Driver(*d.split('\n',3)) for d in out.split('\n---\n')[:-1]]

def dd_extract(rpm_path, outdir, kernel_ver, flags='-blmf'):
     out = subprocess.check_output([os.path.join(UTILDIR, "dd_extract"),
             flags, '-r', rpm_path, '-d', outdir, '-k', kernel_ver],
-            stderr=subprocess.STDOUT)
+            stderr=subprocess.STDOUT).decode('utf-8')
     return out

# helpers for creating RPMs to test with

[master 2/2] Use builddir instead of srcdir to find the dd utils

[dashea]

From: David Shea

---
 tests/dd_tests/dd_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dd_tests/dd_test.py b/tests/dd_tests/dd_test.py
index 7fac060..e857db8 100644
--- a/tests/dd_tests/dd_test.py
+++ b/tests/dd_tests/dd_test.py
@@ -14,7 +14,7 @@
 from collections import namedtuple
 from rpmfluff import SourceFile, SimpleRpmBuild, expectedArch

-TOP_SRCDIR = os.environ.get("top_srcdir", "../..")
+TOP_SRCDIR = os.environ.get("top_builddir", "../..")
 UTILDIR = os.path.join(TOP_SRCDIR, "utils/dd")

# helpers for calling the utilities

[rhinstaller/anaconda/pulls/188 master] Fix the dd_test for python3.

[dashea]

Added label: ACK.

[rhinstaller/anaconda/pulls/188 master] Fix the dd_test for python3.

[dashea]

Closed.

[rhinstaller/anaconda/pulls/188 master] Fix the dd_test for python3.

[dashea]

Pushed.