Import patches-applied version 2.1.5-0ubuntu1 to applied/ubuntu/yakkety-proposed

Imported using git-ubuntu import.

Changelog parent: b0cb938c8bd00066ae0f3cdb9ecf0b1d7f2ca57e
Unapplied parent: a4695e009df8ae6db98497d92216db4ed4e344a1

New changelog entries:
  * New upstream release (LP: #1603581)
    - d/patches/disable-auto-update.patch:
      - The new version introduces auto-updating of the agent to its latest
        version via an internal mechanism; disable this
    - d/patches/fix_shebangs.patch:
      - Dropped in favour of the dh_python3 --shebang option.
    - Refreshed d/patches/disable_udev_overrides.patch

1 files changed, 6 insertions, 4 deletions

diff --git a/tests/utils/test_shell_util.py b/tests/utils/test_shell_util.py
index aa89121..57e6c33 100644
--- a/tests/utils/test_shell_util.py
+++ b/tests/utils/test_shell_util.py
@@ -15,15 +15,12 @@
 #
 # Requires Python 2.4+ and Openssl 1.0+
 #
-# Implements parts of RFC 2131, 1541, 1497 and
-# http://msdn.microsoft.com/en-us/library/cc227282%28PROT.10%29.aspx
-# http://msdn.microsoft.com/en-us/library/cc227259%28PROT.13%29.aspx
 
 from tests.tools import *
 import uuid
 import unittest
 import os
-import azurelinuxagent.utils.shellutil as shellutil
+import azurelinuxagent.common.utils.shellutil as shellutil
 import test
 
 class TestrunCmd(AgentTestCase):
@@ -38,5 +35,10 @@ class TestrunCmd(AgentTestCase):
         err = shellutil.run_get_output(u"ls 我")
         self.assertNotEquals(0, err[0])
 
+    def test_shellquote(self):
+        self.assertEqual("\'foo\'", shellutil.quote("foo"))
+        self.assertEqual("\'foo bar\'", shellutil.quote("foo bar"))
+        self.assertEqual("'foo'\\''bar'", shellutil.quote("foo\'bar"))
+
 if __name__ == '__main__':
     unittest.main()