Import patches-unapplied version 2.1.3-0ubuntu1 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 53f54030cae2de3d5fa474a61fe51f16c7a07c79

New changelog entries:
  * New upstream release (LP: #1543359):
    - Bug fixes for extension handling
    - Feature enablement for AzureStack.

1 files changed, 0 insertions, 223 deletions

diff --git a/tests/test_ext.py b/tests/test_ext.py
deleted file mode 100644
index a68a851..0000000
--- a/tests/test_ext.py
+++ /dev/null
@@ -1,223 +0,0 @@
-# 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+
-#
-# 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
-
-import tests.env
-from tests.tools import *
-import uuid
-import unittest
-import os
-import json
-import azurelinuxagent.logger as logger
-from azurelinuxagent.utils.osutil import OSUTIL
-import azurelinuxagent.utils.fileutil as fileutil
-import azurelinuxagent.protocol as prot
-import azurelinuxagent.distro.default.extension as ext
-
-ext_sample_json = {
-    "name":"TestExt",
-    "properties":{
-        "version":"2.0",
-        "state":"enabled",
-        "upgradePolicy":"auto",
-        "extensions":[{
-            "sequenceNumber": 0,
-            "publicSettings": "",
-            "protectedSettings": "",
-            "certificateThumbprint": ""
-        }],
-        "versionUris":[{
-            "version":"2.1",
-            "uris":["http://foo.bar"]
-        },{
-            "version":"2.0",
-            "uris":["http://foo.bar"]
-        }]
-    }
-}
-ext_sample = prot.ExtHandler()
-prot.set_properties("extensions", ext_sample, ext_sample_json)
-
-pkd_list_sample_str={
-    "versions": [{
-        "version": "2.0",
-        "uris":[{
-            "uri":"http://foo.bar"
-         }]
-    },{
-        "version": "2.1",
-        "uris":[{
-            "uri":"http://foo.bar"
-         }]
-    }]
-}
-pkg_list_sample = prot.ExtHandlerPackageList()
-prot.set_properties("packages", pkg_list_sample, pkd_list_sample_str)
-
-manifest_sample_str = {
-    "handlerManifest":{
-        "installCommand": "echo 'install'",
-        "uninstallCommand": "echo 'uninstall'",
-        "updateCommand": "echo 'update'",
-        "enableCommand": "echo 'enable'",
-        "disableCommand": "echo 'disable'",
-    }
-}
-manifest_sample = ext.HandlerManifest(manifest_sample_str)
-
-ext_status_sample="""
-[{
-    "version": 1.0,
-    "timestampUTC": "2015-11-12T06:59:48Z",
-    "status": {
-        "name": "<Handler workload name>",
-        "operation": "<name of the operation being performed>",
-        "configurationAppliedTime": "2015-11-12T06:59:48Z",
-        "status": "error",
-        "code": 0,
-        "formattedMessage": {
-            "lang": "en-US",
-            "message": "formatted user message"
-        },
-        "substatus": [{
-            "name": "<Handler workload subcomponent name>",
-            "status": "error",
-            "code": 0 ,
-            "formattedMessage": {
-                "lang": "lang[-locale]",
-                "message": "formatted user message"
-            }
-        },{
-            "status": "error"
-        }]
-    }
-}]
-"""
-
-ext_status_sample_min="""
-[{
-    "version": 1.0,
-    "timestampUTC": "2015-11-12T06:59:48Z",
-    "status": {
-        "status": "error"
-    }
-}]
-"""
-
-def mock_load_manifest(self):
-    return manifest_sample
-
-mock_launch_command = MockFunc()
-mock_set_state = MockFunc()
-
-def mock_download(self):
-    fileutil.mkdir(self.get_base_dir())
-    fileutil.write_file(self.get_manifest_file(), json.dumps(manifest_sample_str))
-
-#logger.LoggerInit("/dev/null", "/dev/stdout")
-class TestExtensions(unittest.TestCase):
-
-    def test_load_ext(self):
-        libDir = OSUTIL.get_lib_dir()
-        test_ext1 = os.path.join(libDir, 'TestExt-1.0')
-        test_ext2 = os.path.join(libDir, 'TestExt-2.0')
-        test_ext2 = os.path.join(libDir, 'TestExt-2.1')
-        for path in [test_ext1, test_ext2]:
-            if not os.path.isdir(path):
-                os.mkdir(path)
-        test_ext = ext.get_installed_version('TestExt')
-        self.assertEqual('2.1', test_ext)
-
-    def test_getters(self):
-        test_ext = ext.ExtHandlerInstance(ext_sample, pkg_list_sample, 
-                                          ext_sample.properties.version, False)
-        self.assertEqual("/tmp/TestExt-2.0", test_ext.get_base_dir())
-        self.assertEqual("/tmp/TestExt-2.0/status", test_ext.get_status_dir())
-        self.assertEqual("/tmp/TestExt-2.0/status/0.status", 
-                         test_ext.get_status_file())
-        self.assertEqual("/tmp/handler_state/TestExt-2.0/0.state", 
-                         test_ext.get_handler_state_file())
-        self.assertEqual("/tmp/handler_state/TestExt-2.0/0.error", 
-                         test_ext.get_handler_state_err_file())
-        self.assertEqual("/tmp/TestExt-2.0/config", test_ext.get_conf_dir())
-        self.assertEqual("/tmp/TestExt-2.0/config/0.settings", 
-                         test_ext.get_settings_file())
-        self.assertEqual("/tmp/TestExt-2.0/heartbeat.log", 
-                         test_ext.get_heartbeat_file())
-        self.assertEqual("/tmp/TestExt-2.0/HandlerManifest.json", 
-                         test_ext.get_manifest_file())
-        self.assertEqual("/tmp/TestExt-2.0/HandlerEnvironment.json", 
-                         test_ext.get_env_file())
-        self.assertEqual("/tmp/log/TestExt/2.0", test_ext.get_log_dir())
-
-        test_ext = ext.ExtHandlerInstance(ext_sample, pkg_list_sample, 
-                                          "2.1", False)
-        self.assertEqual("/tmp/TestExt-2.1", test_ext.get_base_dir())
-        self.assertEqual("2.1", test_ext.get_target_version())
-   
-    @mock(ext.ExtHandlerInstance, 'load_manifest', mock_load_manifest)
-    @mock(ext.ExtHandlerInstance, 'launch_command', mock_launch_command)
-    @mock(ext.ExtHandlerInstance, 'set_state', mock_set_state)
-    def test_handle_uninstall(self):
-        mock_launch_command.args = None
-        mock_set_state.args = None
-        test_ext = ext.ExtHandlerInstance(ext_sample, pkg_list_sample, 
-                                          ext_sample.properties.version, False)
-        if not os.path.isdir(test_ext.get_base_dir()):
-            os.makedirs(test_ext.get_base_dir())
-        test_ext.handle_uninstall()
-        self.assertEqual(None, mock_launch_command.args)
-        self.assertEqual(None, mock_set_state.args)
-
-        test_ext = ext.ExtHandlerInstance(ext_sample, pkg_list_sample, 
-                                          ext_sample.properties.version, True)
-        if not os.path.isdir(test_ext.get_base_dir()):
-            os.makedirs(test_ext.get_base_dir())
-        test_ext.handle_uninstall()
-        self.assertEqual(manifest_sample.get_uninstall_command(), 
-                         mock_launch_command.args[0])
-    
-    @mock(ext.ExtHandlerInstance, 'upgrade', MockFunc())
-    @mock(ext.ExtHandlerInstance, 'enable', MockFunc())
-    @mock(ext.ExtHandlerInstance, 'download', MockFunc())
-    @mock(ext.ExtHandlerInstance, 'init_dir', MockFunc())
-    @mock(ext.ExtHandlerInstance, 'install', MockFunc())
-    def test_handle_enable(self):
-        #Test enable
-        test_ext = ext.ExtHandlerInstance(ext_sample, pkg_list_sample, 
-                                          ext_sample.properties.version, False)
-        test_ext.handle_enable()
-     
-        #Test upgrade 
-        test_ext = ext.ExtHandlerInstance(ext_sample, pkg_list_sample, 
-                                          "2.0" , True)
-        test_ext.handle_enable()
-
-    def test_status_convert(self):
-        data = json.loads(ext_status_sample)
-        ext_status = prot.ExtensionStatus()
-        ext.parse_ext_status(ext_status, data)
-
-        data = json.loads(ext_status_sample_min)
-        ext_status = prot.ExtensionStatus()
-        ext.parse_ext_status(ext_status, data)
-
-
-if __name__ == '__main__':
-    unittest.main()