Add debian distro and fix python issues

Add debian as distro decode() added when necessary test on null string fixed updat valgrind package release Signed-off-by: Thierry <[email protected]>
kvaneesh · Jan 9, 2020 · 2c48de4 · 2c48de4
1 parent 216261b
commit 2c48de4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/generic/stress-ng.py b/generic/stress-ng.py
@@ -63,7 +63,7 @@ def setUp(self):
         self.parallel = self.params.get('parallel', default=True)
 
         deps = ['gcc', 'make']
-        if 'Ubuntu' in detected_distro.name:
+        if detected_distro.name in ['Ubuntu', 'debian']:
             deps.extend([
                 'libaio-dev', 'libapparmor-dev', 'libattr1-dev', 'libbsd-dev',
                 'libcap-dev', 'libgcrypt11-dev', 'libkeyutils-dev',

diff --git a/io/disk/multipath_test.py b/io/disk/multipath_test.py
@@ -55,7 +55,7 @@ def setUp(self):
         dist = distro.detect()
         pkg_name = ""
         svc_name = ""
-        if dist.name == 'Ubuntu':
+        if dist.name in ['Ubuntu', 'debian']:
             pkg_name += "multipath-tools"
             svc_name = "multipath-tools"
         elif dist.name == 'SuSE':
@@ -79,7 +79,7 @@ def setUp(self):
                 wwids_to_remove.append(wwid)
         for wwid in wwids_to_remove:
             self.wwids.remove(wwid)
-        if self.wwids == []:
+        if self.wwids == ['']:
             self.cancel("No Multipath Devices Given")
 
         # Create service object

diff --git a/kernel/tlbflush.py b/kernel/tlbflush.py
@@ -74,7 +74,7 @@ def set_value(self):
             if self.nr_entries > max_entries:
                 self.nr_entries = max_entries
 
-            out = self.run()
+            out = self.run().decode()
             self.perf_json.append({'Test time' + str(ite): out})
         self.whiteboard = json.dumps(self.perf_json)
 

diff --git a/toolchain/valgrind.py b/toolchain/valgrind.py
@@ -37,7 +37,7 @@ def setUp(self):
 
         dist = distro.detect()
         deps = ['gcc', 'make']
-        if dist.name == 'Ubuntu':
+        if dist.name in ['Ubuntu', 'debian']:
             deps.extend(['g++'])
         # FIXME: "redhat" as the distro name for RHEL is deprecated
         # on Avocado versions >= 50.0.  This is a temporary compatibility
@@ -50,7 +50,7 @@ def setUp(self):
         run_type = self.params.get('type', default='upstream')
         if run_type == "upstream":
             url = self.params.get('url', default="ftp://sourceware.org/pub/"
-                                  "valgrind/valgrind-3.13.0.tar.bz2")
+                                  "valgrind/valgrind-3.15.0.tar.bz2")
             tarball = self.fetch_asset(url)
             archive.extract(tarball, self.workdir)
             version = os.path.basename(tarball.split('.tar.')[0])