Import patches-unapplied version 2.0.8-0ubuntu1 to ubuntu/utopic-proposed

Imported using git-ubuntu import.

Changelog parent: ffe54a5ad34c480106b4c61b28290cc714b627ee

New changelog entries:
  * New upstream release (LP: #1356479).
    - Fixed issue of reporting SSH keys to fabric
      - wait for Cloud-init to provision the host keys
    - Multiple fixes for extension handlers
      - capture output of subprocess, prevent subprocess failure
      - prevent fabric from continuously querying host if no extensions
        are installed.

2 files changed, 70 insertions, 0 deletions

diff --git a/tests/env.py b/tests/env.py
new file mode 100644
index 0000000..ea33c89
--- /dev/null
+++ b/tests/env.py
@@ -0,0 +1,23 @@
+# 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.
+#
+
+import imp
+import os
+
+projet_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+waagent = imp.load_source('waagent', os.path.join(projet_root, 'waagent'))
+
+waagent.LoggerInit('/tmp/test.log','/dev/stdout')
+
diff --git a/tests/test_utils.py b/tests/test_utils.py
new file mode 100644
index 0000000..00feb6c
--- /dev/null
+++ b/tests/test_utils.py
@@ -0,0 +1,47 @@
+# 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.
+#
+
+import unittest
+from env import waagent
+
+sample_mount_list = """\
+/dev/sda1 on / type ext4 (rw)
+proc on /proc type proc (rw)
+sysfs on /sys type sysfs (rw)
+devpts on /dev/pts type devpts (rw,gid=5,mode=620)
+tmpfs on /dev/shm type tmpfs (rw,rootcontext="system_u:object_r:tmpfs_t:s0")
+none on /proc/sys/fs/binfmt_misc type binfmt_misc (rw)
+/dev/sdb1 on /mnt/resource type ext4 (rw)
+"""
+
+device_name="/dev/sdb"
+
+class TestWAAgentUtils(unittest.TestCase):
+    
+    def test_get_mount_point(self):
+        normal = sample_mount_list
+        mp = waagent.GetMountPoint(normal, device_name)
+        self.assertEqual(mp, '/mnt/resource')
+
+        null = None
+        mp = waagent.GetMountPoint(null, device_name)
+        self.assertEqual(mp, None)
+
+        malformed = 'asdfasdfasdfa aasdf'
+        mp = waagent.GetMountPoint(malformed, device_name)
+        self.assertEqual(mp, None)
+
+if __name__ == '__main__':
+    unittest.main()