Merge pull request #107 from lmr/fix-archive-mistake

Fix archive mistake

avocado/linux/kernel_build.py

@@ -18,8 +18,6 @@ import os
 import logging
 import shutil
 
-from avocado import test
-from avocado import job
 from avocado.utils import download, archive, build
 
 log = logging.getLogger('avocado.test')

avocado/plugins/vm.py

@@ -94,8 +94,7 @@ class VMTestRunner(TestRunner):
         zip_filename = remote_log_dir + '.zip'
         zip_path_filename = os.path.join(local_log_dir, os.path.basename(zip_filename))
         self.result.vm.remote.receive_files(local_log_dir, zip_filename)
-        archive.uncompress_zip(zip_path_filename,
-                               local_log_dir)
+        archive.uncompress(zip_path_filename, local_log_dir)
         os.remove(zip_path_filename)
         self.result.tear_down()
         return failures

avocado/utils/remote.py

@@ -109,7 +109,7 @@ class Remote(object):
             try:
                 fabric.operations.put(local_path,
                                       remote_path)
-            except ValueError as err:
+            except ValueError:
                 return False
         return True
 
@@ -124,6 +124,6 @@ class Remote(object):
             try:
                 fabric.operations.get(remote_path,
                                       local_path)
-            except ValueError as err:
+            except ValueError:
                 return False
         return True

tests/linuxbuild/linuxbuild.py

@@ -29,7 +29,7 @@ class linuxbuild(test.Test):
 
     def setup(self):
         kernel_version = self.params.linux_version
-        config_path = tarball_path = self.get_deps_path('config')
+        config_path = self.get_deps_path('config')
         self.linux_build = kernel_build.KernelBuild(kernel_version,
                                                     config_path,
                                                     self.srcdir)