From 83be006e288c58a46f5b76c29b6886c1f417d88c Mon Sep 17 00:00:00 2001 From: Łukasz 'sil2100' Zemczak Date: Wed, 15 Mar 2017 10:19:34 +0100 Subject: Import patches-unapplied version 2.2.6-0ubuntu1 to ubuntu/zesty-proposed Imported using git-ubuntu import. Changelog parent: d064ab0bffd429382ea4fafeb144784d403848bd New changelog entries: * New upstream release (LP: #1661750). * debian/control: - Change the maintainer to Ubuntu Developers (LP: #1657528). - Add the dependency of isc-dhcp-client as our maintainer scripts assume it's installed. - Add trailing commas to dependencies, add whitespaces. * Rename ephemeral-disk-warning.sh to ephemeral-disk-warning (lintian error). * debian/docs: - Remove LICENSE.txt as it's redundant. * debian/postinst: - Stop checking for update-initramfs existence using the absolute path, use the 'command' command instead to make lintian happy. * Remove debian/patches/disable-auto-update.patch: - We now ship with auto-updates enabled (LP: #1650522). * debian/maintscript: - Add a maintscript to rename the old logrotate file on upgrade from an ancient version of walinuxagent (LP: #1673152). --- tests/ga/test_monitor.py | 50 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) (limited to 'tests/ga/test_monitor.py') diff --git a/tests/ga/test_monitor.py b/tests/ga/test_monitor.py index 838d037..c646cef 100644 --- a/tests/ga/test_monitor.py +++ b/tests/ga/test_monitor.py @@ -16,7 +16,6 @@ # from tests.tools import * -from azurelinuxagent.common.exception import * from azurelinuxagent.ga.monitor import * class TestMonitor(AgentTestCase): @@ -27,3 +26,52 @@ class TestMonitor(AgentTestCase): self.assertNotEquals(0, event.parameters) self.assertNotEquals(None, event.parameters[0]) + @patch('azurelinuxagent.common.osutil.get_osutil') + @patch('azurelinuxagent.common.protocol.get_protocol_util') + def test_add_sysinfo(self, _, __): + data_str = load_data('ext/event.xml') + event = parse_xml_event(data_str) + monitor_handler = get_monitor_handler() + + vm_name = 'dummy_vm' + tenant_name = 'dummy_tenant' + role_name = 'dummy_role' + role_instance_name = 'dummy_role_instance' + container_id = 'dummy_container_id' + + vm_name_param = "VMName" + tenant_name_param = "TenantName" + role_name_param = "RoleName" + role_instance_name_param = "RoleInstanceName" + container_id_param = "ContainerId" + + sysinfo = [TelemetryEventParam(vm_name_param, vm_name), + TelemetryEventParam(tenant_name_param, tenant_name), + TelemetryEventParam(role_name_param, role_name), + TelemetryEventParam(role_instance_name_param, role_instance_name), + TelemetryEventParam(container_id_param, container_id)] + monitor_handler.sysinfo = sysinfo + monitor_handler.add_sysinfo(event) + + self.assertNotEquals(None, event) + self.assertNotEquals(0, event.parameters) + self.assertNotEquals(None, event.parameters[0]) + counter = 0 + for p in event.parameters: + if p.name == vm_name_param: + self.assertEquals(vm_name, p.value) + counter += 1 + elif p.name == tenant_name_param: + self.assertEquals(tenant_name, p.value) + counter += 1 + elif p.name == role_name_param: + self.assertEquals(role_name, p.value) + counter += 1 + elif p.name == role_instance_name_param: + self.assertEquals(role_instance_name, p.value) + counter += 1 + elif p.name == container_id_param: + self.assertEquals(container_id, p.value) + counter += 1 + + self.assertEquals(5, counter) -- cgit v1.2.3