Merge ~kevinbecker/+git/autotest-client-tests:kevinbecker/rtevalfix into ~canonical-kernel-team/+git/autotest-client-tests:master

[Kevin Becker]

UBUNTU: SAUCE: Fix rteval test to support both Python 2 and 3

Signed-off-by: Kevin Becker <email address hidden>

[Francis Ginther (fginther)]

+1

[Sean Feole (sfeole)]

+1

review: Approve

diff --git a/rteval/rteval.py b/rteval/rteval.py
index 0508567..de0b277 100644
--- a/rteval/rteval.py
+++ b/rteval/rteval.py
@@ -75,7 +75,7 @@ class rteval(test.test):
         os.mkdir("install")
 
         # Download Linux tarball referenced in the Makefile
-        with open("Makefile", mode="rt", encoding="utf-8") as makefile:
+        with open("Makefile", mode="rt") as makefile:
             makefile_content = makefile.read()
             linux_version_match = re.search(r'KLOAD\s*:=\s*\$\(LOADDIR\)\/linux-(\d+\.\d+(\.\d+)?)\.tar\.xz', makefile_content)
             if linux_version_match:
@@ -113,7 +113,7 @@ class rteval(test.test):
 
         # Find the summary XML results
         results_count = 0
-        subfolders = [ f.name for f in os.scandir(self.srcdir+"/rteval/run/") if f.is_dir() ]
+        subfolders = [f for f in os.listdir(self.srcdir+"/rteval/run/") if os.path.isdir(os.path.join(self.srcdir+"/rteval/run/", f))]
         for folder in subfolders:
             folder_match = re.search(r"rteval-"+datetime.now().strftime('%Y%m%d')+"-(\d)+[^(.tar.bz2)]?", folder)
             if folder_match: