commit 9c6dfb188013a548b0261d283a935bf033b711b7
author Momo Sasaki <momosasaki@google.com> Thu Apr 15 02:52:20 2021
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Apr 15 02:52:20 2021
tree d1b2bc77ed79da618014ec5adce2cfa4df1dc286
parent 7fb33784cc8df900165b28b9748fecd1928fada8

[swarming] make cmd_ver_out bytes in test_get_os_dims_mock*

mocked subprocess.check_output() should return in bytes in python3 therefore make cmd_ver_out bytes in test_get_os_dims_mock* in win_test.py.
clear cache before mock.
unskip succeeding tests.

Bug: 1198856, 1017545
Change-Id: Ie509a6ac300cd01686df9389beaea26464eeef6f
Reviewed-on: https://chromium-review.googlesource.com/c/infra/luci/luci-py/+/2825768
Commit-Queue: Momo Sasaki <momosasaki@google.com>
Reviewed-by: Junji Watanabe <jwata@google.com>

appengine/swarming/swarming_bot/api/platforms/win_test.py

diff --git a/appengine/swarming/swarming_bot/api/platforms/win_test.py b/appengine/swarming/swarming_bot/api/platforms/win_test.py
index d1cf231..931fe1c 100755
--- a/appengine/swarming/swarming_bot/api/platforms/win_test.py
+++ b/appengine/swarming/swarming_bot/api/platforms/win_test.py
@@ -30,6 +30,14 @@
 
 class TestWin(auto_stub.TestCase):
 
+  def setUp(self):
+    super(TestWin, self).setUp()
+    tools.clear_cache_all()
+
+  def tearDown(self):
+    super(TestWin, self).tearDown()
+    tools.clear_cache_all()
+
   def test_from_cygwin_path(self):
     data = [
         ('foo', None),
@@ -96,45 +104,32 @@
     self.assertEqual([marketing_name_client_ver_map[marketing_name]],
                      client_ver)
 
-  @unittest.skipIf(sys.platform == 'win32' or six.PY3,
-                   'TODO(crbug.com/1017545): fix assertions')
   def test_get_os_dims_mock_win10(self):
     self.assert_get_os_dims_mock(
-        1, u'\nMicrosoft Windows [Version 10.0.17763.503]',
+        1, b'\nMicrosoft Windows [Version 10.0.17763.503]',
         ('10', '10.0.17763', '', u'Multiprocessor Free'),
         [u'10', u'10-17763', u'10-17763.503'])
 
-  @unittest.skipIf(
-      sys.platform == 'win32' or six.PY3,
-      'TODO(crbug.com/1017545): fix assertions')
   def test_get_os_dims_mock_win2016(self):
     self.assert_get_os_dims_mock(
-        3, '\nMicrosoft Windows [Version 10.0.14393]\n',
+        3, b'\nMicrosoft Windows [Version 10.0.14393]\n',
         ('10', '10.0.14393', '', u'Multiprocessor Free'),
         [u'Server', u'Server-14393'])
 
-  @unittest.skipIf(
-      sys.platform == 'win32' or six.PY3,
-      'TODO(crbug.com/1017545): fix assertions')
   def test_get_os_dims_mock_win2019(self):
     self.assert_get_os_dims_mock(
-        3, '\nMicrosoft Windows [Version 10.0.17763.557]\n',
+        3, b'\nMicrosoft Windows [Version 10.0.17763.557]\n',
         ('10', '10.0.17763', '', u'Multiprocessor Free'),
         [u'Server', u'Server-17763', u'Server-17763.557'])
 
-  @unittest.skipIf(sys.platform == 'win32' or six.PY3,
-                   'TODO(crbug.com/1017545): fix assertions')
   def test_get_os_dims_mock_win7sp1(self):
     self.assert_get_os_dims_mock(
-        1, '\nMicrosoft Windows [Version 6.1.7601]\n',
+        1, b'\nMicrosoft Windows [Version 6.1.7601]\n',
         ('7', '6.1.7601', 'SP1', u'Multiprocessor Free'), [u'7', u'7-SP1'])
 
-  @unittest.skipIf(
-      sys.platform == 'win32' or six.PY3,
-      'TODO(crbug.com/1017545): fix assertions')
   def test_get_os_dims_mock_win8_1(self):
     self.assert_get_os_dims_mock(
-        1, '\nMicrosoft Windows [Version 6.3.9600]\n',
+        1, b'\nMicrosoft Windows [Version 6.3.9600]\n',
         ('8.1', '6.3.9600', '', u'Multiprocessor Free'), [u'8.1', u'8.1-SP0'])