Import patches-unapplied version 2.2.2-0ubuntu1 to ubuntu/zesty-proposed

Imported using git-ubuntu import.

Changelog parent: 63d399807de30a64456e672063e7c20babf7aadc

New changelog entries:
  * New upstream release (LP: #1651128)
    - d/patches/fix-auto-update.patch,
      d/patches/lp1623570-adjust-walinuxagent-service-after-and-wants.patch:
      - Dropped as changes have been applied upstream
    - Refreshed debian/patches/disable_import_test.patch

1 files changed, 53 insertions, 4 deletions

diff --git a/tests/utils/test_file_util.py b/tests/utils/test_file_util.py
index 9a5479e..f16f409 100644
--- a/tests/utils/test_file_util.py
+++ b/tests/utils/test_file_util.py
@@ -24,8 +24,9 @@ from azurelinuxagent.common.future import ustr
 import azurelinuxagent.common.utils.fileutil as fileutil
 
 class TestFileOperations(AgentTestCase):
+
     def test_read_write_file(self):
-        test_file=os.path.join(self.tmp_dir, 'test_file')
+        test_file=os.path.join(self.tmp_dir, self.test_file)
         content = ustr(uuid.uuid4())
         fileutil.write_file(test_file, content)
 
@@ -34,7 +35,7 @@ class TestFileOperations(AgentTestCase):
         os.remove(test_file)
     
     def test_rw_utf8_file(self):
-        test_file=os.path.join(self.tmp_dir, 'test_file')
+        test_file=os.path.join(self.tmp_dir, self.test_file)
         content = u"\u6211"
         fileutil.write_file(test_file, content, encoding="utf-8")
 
@@ -43,14 +44,14 @@ class TestFileOperations(AgentTestCase):
         os.remove(test_file)
 
     def test_remove_bom(self):
-        test_file=os.path.join(self.tmp_dir, 'test_file')
+        test_file=os.path.join(self.tmp_dir, self.test_file)
         data = b'\xef\xbb\xbfhehe'
         fileutil.write_file(test_file, data, asbin=True)
         data = fileutil.read_file(test_file, remove_bom=True)
         self.assertNotEquals(0xbb, ord(data[0]))
    
     def test_append_file(self):
-        test_file=os.path.join(self.tmp_dir, 'test_file')
+        test_file=os.path.join(self.tmp_dir, self.test_file)
         content = ustr(uuid.uuid4())
         fileutil.append_file(test_file, content)
 
@@ -68,5 +69,53 @@ class TestFileOperations(AgentTestCase):
         filename = fileutil.base_name(filepath)
         self.assertEquals('abc', filename)
 
+    def test_remove_files(self):
+        import random
+        import string
+        import glob
+        random_word = lambda : ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(5))
+
+        #Create 10 test files
+        test_file = os.path.join(self.tmp_dir, self.test_file)
+        test_file2 = os.path.join(self.tmp_dir, 'another_file')
+        test_files = [test_file + random_word() for _ in range(5)] + \
+                     [test_file2 + random_word() for _ in range(5)]
+        for file in test_files:
+            open(file, 'a').close()
+
+        #Remove files using fileutil.rm_files
+        test_file_pattern = test_file + '*'
+        test_file_pattern2 = test_file2 + '*'
+        fileutil.rm_files(test_file_pattern, test_file_pattern2)
+
+        self.assertEqual(0, len(glob.glob(os.path.join(self.tmp_dir, test_file_pattern))))
+        self.assertEqual(0, len(glob.glob(os.path.join(self.tmp_dir, test_file_pattern2))))
+
+    def test_get_all_files(self):
+        import random
+        import string
+        random_word = lambda: ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(5))
+
+        # Create 10 test files at the root dir and 10 other in the sub dir
+        test_file = os.path.join(self.tmp_dir, self.test_file)
+        test_file2 = os.path.join(self.tmp_dir, 'another_file')
+        expected_files = [test_file + random_word() for _ in range(5)] + \
+                     [test_file2 + random_word() for _ in range(5)]
+
+        test_subdir = os.path.join(self.tmp_dir, 'test_dir')
+        os.mkdir(test_subdir)
+        test_file_in_subdir = os.path.join(test_subdir, self.test_file)
+        test_file_in_subdir2 = os.path.join(test_subdir, 'another_file')
+        expected_files.extend([test_file_in_subdir + random_word() for _ in range(5)] + \
+                     [test_file_in_subdir2 + random_word() for _ in range(5)])
+
+        for file in expected_files:
+            open(file, 'a').close()
+
+        # Get All files using fileutil.get_all_files
+        actual_files = fileutil.get_all_files(self.tmp_dir)
+
+        self.assertEqual(set(expected_files), set(actual_files))
+
 if __name__ == '__main__':
     unittest.main()