adding os metrics (os name and version) being collected every hour

infra/services/sysmon/test/system_metrics_test.py

 # Copyright (c) 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import collections
 import os
 import sys
 import unittest
 
 import mock
@@ skipping 139 matching lines @@
           system_metrics.load_average.get(fields={'minutes': 1}), 0)
       self.assertGreater(
           system_metrics.load_average.get(fields={'minutes': 5}), 0)
       self.assertGreater(
           system_metrics.load_average.get(fields={'minutes': 15}), 0)
 
   def test_get_unix_time(self):
     system_metrics.get_unix_time()
     self.assertTrue(
       1464000000000 < system_metrics.unix_time.get() < 9464000000000)
+
+  @mock.patch('platform.system')
+  @mock.patch('platform.mac_ver')
+  @mock.patch('platform.machine')
+  @mock.patch('sys')
+  def test_os_info_mac_10115_64_64(self,
+                                   platform_system_mock,
+                                   platform_mac_ver_mock,
+                                   platform_machine_mock,
+                                   sys_mock):
+    platform_system_mock.return_value = 'Darwin'
+    platform_mac_ver_mock.return_value = ('10.11.5', ('', '', ''), 'x86_64')
+    platform_machine_mock.return_value = 'x86_64'
+    sys_mock.maxsize = 9223372036854775807
+
+    system_metrics.get_os_info()
+
+    self.AssertTrue(platform_system_mock.called)

[dsansome, 2016/07/01 04:30:56]

Does this work?  The methods are named with a lower-case first letter

[dsansome, 2016/07/01 04:30:56]

Also platform_system_mock.assert_called_once_with()

[chrishall, 2016/07/01 04:53:57]

very nice!

[chrishall, 2016/07/01 04:53:57]

Done.

[chrishall, 2016/07/01 04:53:57]

Done.

[chrishall, 2016/07/01 04:53:57]

Done.

+    self.AssertTrue(platform_mac_ver_mock.called)
+    self.AssertTrue(platform_machine_mock.called)
+
+    self.AssertEqual('mac', system_metrics.os_name.get())
+    self.AssertEqual('10.11.5', system_metrics.os_version.get())
+    self.AssertEqual('x86_64', system_metrics.os_arch.get())
+    self.AssertEqual('64', system_metrics.python_arch.get())
+
+  @mock.patch('platform.system')
+  @mock.patch('platform.release')
+  @mock.patch('platform.machine')
+  @mock.patch('sys')
+  def test_os_info_windows_7_32_32(self,
+                                   platform_system_mock,
+                                   platform_release_mock,
+                                   platform_machine_mock,
+                                   sys_mock):
+    platform_system_mock.return_value = 'Windows'
+    platform_release_mock.return_value = '7'
+    platform_machine_mock.return_value = 'x86'
+    sys_mock.maxsize = 2147483647
+
+    system_metrics.get_os_info()
+
+    self.AssertTrue(platform_system_mock.called)
+    self.AssertTrue(platform_release_mock.called)
+    self.AssertTrue(platform_machine_mock.called)
+
+    self.AssertEqual('windows', system_metrics.os_name.get())
+    self.AssertEqual('7', system_metrics.os_version.get())
+    self.AssertEqual('x86', system_metrics.os_arch.get())
+    self.AssertEqual('32', system_metrics.python_arch.get())
+
+  @mock.patch('platform.system')
+  @mock.patch('platform.dist')
+  @mock.patch('platform.machine')
+  @mock.patch('sys')
+  def test_os_info_ubuntu_1404_32_32(self,
+                                     platform_system_mock,
+                                     platform_dist_mock,
+                                     platform_machine_mock,
+                                     sys_mock):
+    platform_system_mock.return_value = 'Linux'
+    platform_dist_mock.return_value = ('Ubuntu', '14.04', 'trusty')
+    platform_machine_mock.return_value = 'i686'
+    sys_mock.maxsize_mock = 2147483647
+
+    system_metrics.get_os_info()
+
+    self.AssertTrue(platform_system_mock.called)
+    self.AssertTrue(platform_dist_mock.called)
+    self.AssertTrue(platform_machine_mock.called)
+
+    self.AssertEqual('ubuntu', system_metrics.os_name.get())
+    self.AssertEqual('14.04', system_metrics.os_version.get())
+    self.AssertEqual('i686', system_metrics.os_arch.get())
+    self.AssertEqual('32', system_metrics.python_arch.get())
+
+  @mock.patch('platform.system')
+  @mock.patch('platform.dist')
+  @mock.patch('platform.machine')
+  @mock.patch('sys')
+  def test_os_info_ubuntu_1404_64_32(self,
+                                     platform_system_mock,
+                                     platform_dist_mock,
+                                     platform_machine_mock,
+                                     sys_mock):
+    platform_system_mock.return_value = 'Linux'
+    platform_dist_mock.return_value = ('Ubuntu', '14.04', 'trusty')
+    platform_machine_mock.return_value = 'x86_64'
+    sys_mock.maxsize = 2147483647
+
+    system_metrics.get_os_info()
+
+    self.AssertTrue(platform_system_mock.called)
+    self.AssertTrue(platform_dist_mock.called)
+    self.AssertTrue(platform_machine_mock.called)
+
+    self.AssertEqual('ubuntu', system_metrics.os_name.get())
+    self.AssertEqual('14.04', system_metrics.os_version.get())
+    self.AssertEqual('x86_64', system_metrics.os_arch.get())
+    self.AssertEqual('32', system_metrics.python_arch.get())
+
+  @mock.patch('platform.system')
+  @mock.patch('platform.dist')
+  @mock.patch('platform.machine')
+  @mock.patch('sys')
+  def test_os_info_ubuntu_1404_64_64(self,
+                                     platform_system_mock,
+                                     platform_dist_mock,
+                                     platform_machine_mock,
+                                     sys_mock):
+    platform_system_mock.return_value = 'Linux'
+    platform_dist_mock.return_value = ('Ubuntu', '14.04', 'trusty')
+    platform_machine_mock.return_value = 'x86_64'
+    sys_mock.maxsize = 9223372036854775807
+
+    system_metrics.get_os_info()
+
+    self.AssertTrue(platform_system_mock.called)
+    self.AssertTrue(platform_dist_mock.called)
+    self.AssertTrue(platform_machine_mock.called)
+
+    self.AssertEqual('ubuntu', system_metrics.os_name.get())
+    self.AssertEqual('14.04', system_metrics.os_version.get())
+    self.AssertEqual('x86_64', system_metrics.os_arch.get())
+    self.AssertEqual('64', system_metrics.python_arch.get())
+
+