Import patches-applied version 2.1.1-0ubuntu1 to applied/ubuntu/wily-proposed

Imported using git-ubuntu import.

Changelog parent: 0d1d620c8c7947e4aa3b330bb667583413146984
Unapplied parent: 4298c5d285f55ff0b3a45e8b9139a96c64d3ffc0

New changelog entries:
  * New upstream release for Ubuntu.
    - Switch to Python3
    - Applies Ubuntu specific patches

1 files changed, 12 insertions, 8 deletions

diff --git a/tests/tools.py b/tests/tools.py
index 27e16d3..392f395 100644
--- a/tests/tools.py
+++ b/tests/tools.py
@@ -21,6 +21,8 @@
 
 import os
 import sys
+from functools import wraps
+from azurelinuxagent.utils.osutil import OSUTIL
 
 parent = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 sys.path.append(parent)
@@ -30,9 +32,10 @@ def simple_file_grep(file_path, search_str):
          if search_str in line:
                 return line
 
-def Mockup(target, name, mock):
-    def Decorator(func):
-        def Wrapper(*args, **kwargs):
+def mock(target, name, mock):
+    def decorator(func):
+        @wraps(func)
+        def wrapper(*args, **kwargs):
             origin = getattr(target, name)
             setattr(target, name, mock)
             try:
@@ -42,10 +45,10 @@ def Mockup(target, name, mock):
             finally:
                 setattr(target, name, origin)
             return result
-        return Wrapper
-    return Decorator
+        return wrapper
+    return decorator
 
-class MockFunc():
+class MockFunc(object):
     def __init__(self, name='', retval=None):
         self.name = name
         self.retval = retval
@@ -56,6 +59,7 @@ class MockFunc():
         self.kwargs = kwargs
         return self.retval
 
-def Dummy():
-    pass
 
+#Mock osutil so that the test of other part will be os unrelated
+OSUTIL.get_lib_dir = MockFunc(retval='/tmp')
+OSUTIL.get_ext_log_dir = MockFunc(retval='/tmp/log')