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

Imported using git-ubuntu import.

Changelog parent: a05019d9343d0fde153d75a8e61fb6f99d1d3ff3
Unapplied parent: 558111e33720eb8f1eaacf571cf4fadae2430286

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, 43 insertions, 0 deletions

diff --git a/tests/daemon/test_resourcedisk.py b/tests/daemon/test_resourcedisk.py
new file mode 100644
index 0000000..d2fc8fb
--- /dev/null
+++ b/tests/daemon/test_resourcedisk.py
@@ -0,0 +1,43 @@
+# Copyright 2014 Microsoft Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Requires Python 2.4+ and Openssl 1.0+
+#
+
+from tests.tools import *
+from azurelinuxagent.common.exception import *
+from azurelinuxagent.daemon import *
+from azurelinuxagent.daemon.resourcedisk.default import ResourceDiskHandler
+
+class TestResourceDisk(AgentTestCase):
+    def test_mount_flags_empty(self):
+        partition = '/dev/sdb1'
+        mountpoint = '/mnt/resource'
+        options = None
+        expected = 'mount /dev/sdb1 /mnt/resource'
+        rdh = ResourceDiskHandler()
+        mount_string = rdh.get_mount_string(options, partition, mountpoint)
+        self.assertEqual(expected, mount_string)
+
+    def test_mount_flags_many(self):
+        partition = '/dev/sdb1'
+        mountpoint = '/mnt/resource'
+        options = 'noexec,noguid,nodev'
+        expected = 'mount -o noexec,noguid,nodev /dev/sdb1 /mnt/resource'
+        rdh = ResourceDiskHandler()
+        mount_string = rdh.get_mount_string(options, partition, mountpoint)
+        self.assertEqual(expected, mount_string)
+
+if __name__ == '__main__':
+    unittest.main()