commit 4f6e7a726280484e41fcc1e0cb28b35f872e98a3
author Mike Frysinger <vapier@chromium.org> Wed Aug 28 11:17:13 2019 -0400
committer Commit Bot <commit-bot@chromium.org> Tue Nov 26 21:03:03 2019 +0000
tree 9d8bb6f490da765670310980640313e84457a308
parent 7ec22324451f3b3c7c630ea4d9e825d357fd4ffe

puppet_metrics_unittests: switch to io.StringIO

Since Python 3 dropped StringIO, switch over to io.StringIO.
Seems to just work here.

BUG=chromium:997354
TEST=`./run_tests` passes

Change-Id: Ica3451711461e751d0f4563fbd68198b3aca32f1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1935250
Reviewed-by: Allen Li <ayatane@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

scripts/sysmon/puppet_metrics_unittest.py

diff --git a/scripts/sysmon/puppet_metrics_unittest.py b/scripts/sysmon/puppet_metrics_unittest.py
index 2a03662..4396c4f 100644
--- a/scripts/sysmon/puppet_metrics_unittest.py
+++ b/scripts/sysmon/puppet_metrics_unittest.py
@@ -10,16 +10,16 @@
 from __future__ import absolute_import
 from __future__ import print_function
 
+import io
 import os
 
 import mock
-from six.moves import StringIO
 
 from chromite.lib import cros_test_lib
 from chromite.scripts.sysmon import puppet_metrics
 
 
-_SUMMARY = """\
+_SUMMARY = u"""\
 ---
   version:
     config: 1499979608
@@ -63,22 +63,22 @@
   """Tests for _PuppetRunSummary."""
 
   def test_config_version(self):
-    summary = puppet_metrics._PuppetRunSummary(StringIO(_SUMMARY))
+    summary = puppet_metrics._PuppetRunSummary(io.StringIO(_SUMMARY))
     self.assertEqual(summary.config_version, 1499979608)
 
   def test_puppet_version(self):
-    summary = puppet_metrics._PuppetRunSummary(StringIO(_SUMMARY))
+    summary = puppet_metrics._PuppetRunSummary(io.StringIO(_SUMMARY))
     self.assertEqual(summary.puppet_version, '3.4.3')
 
   def test_events(self):
-    summary = puppet_metrics._PuppetRunSummary(StringIO(_SUMMARY))
+    summary = puppet_metrics._PuppetRunSummary(io.StringIO(_SUMMARY))
     self.assertEqual(summary.events, {
         'failure': 0,
         'success': 7
     })
 
   def test_resources(self):
-    summary = puppet_metrics._PuppetRunSummary(StringIO(_SUMMARY))
+    summary = puppet_metrics._PuppetRunSummary(io.StringIO(_SUMMARY))
     self.assertEqual(summary.resources, {
         'changed': 7,
         'failed': 0,
@@ -91,7 +91,7 @@
     })
 
   def test_times(self):
-    summary = puppet_metrics._PuppetRunSummary(StringIO(_SUMMARY))
+    summary = puppet_metrics._PuppetRunSummary(io.StringIO(_SUMMARY))
     self.assertEqual(summary.times, {
         'config_retrieval': 2.862796974,
         'cron': 0.004638468,
@@ -111,7 +111,7 @@
     })
 
   def test_last_run_time(self):
-    summary = puppet_metrics._PuppetRunSummary(StringIO(_SUMMARY))
+    summary = puppet_metrics._PuppetRunSummary(io.StringIO(_SUMMARY))
     self.assertEqual(summary.last_run_time, 1499979671)