commit 8a789f697e5d9c08c59a3a1580be4e84f601e3cc
author Mike Frysinger <vapier@chromium.org> Fri Jan 29 00:24:43 2021 -0500
committer Commit Bot <commit-bot@chromium.org> Thu Feb 04 00:39:53 2021 +0000
tree 6aeff59457397e1e168b85366bb92bc5c21707db
parent 9c919d5e0c02a9f76e441793cdc2d67b89d364ef

ts_mon_config: convert to python3 only

All users of these modules are python3 only already.

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

Change-Id: I00195f26fd45b98e723b3a7575b1f1286dac672f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2673499
Tested-by: Mike Frysinger <vapier@chromium.org>
Auto-Submit: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Sean Abraham <seanabraham@chromium.org>
Reviewed-by: Sean Abraham <seanabraham@chromium.org>

lib/metrics_unittest.py

diff --git a/lib/metrics_unittest.py b/lib/metrics_unittest.py
index 4b5cd32..4717e24 100644
--- a/lib/metrics_unittest.py
+++ b/lib/metrics_unittest.py
@@ -7,16 +7,19 @@
 
 from __future__ import print_function
 
+import sys
 import tempfile
+import unittest
 
 import mock
 
 from chromite.lib import cros_test_lib
 from chromite.lib import metrics
 from chromite.lib import parallel
-from chromite.lib import ts_mon_config
+if sys.version_info.major >= 3:
+  from chromite.lib import ts_mon_config
 
-from infra_libs import ts_mon
+from infra_libs import ts_mon  # pylint: disable=wrong-import-position
 
 
 class FakeException(Exception):
@@ -61,6 +64,7 @@
                      'time',
                      mock.Mock(time=mock.Mock(side_effect=TimeIterator())))
 
+  @unittest.skipIf(sys.version_info.major < 3, 'Requires py3')
   def testShortLived(self):
     """Tests that configuring ts-mon to use short-lived processes works."""
     self.patchTime()
@@ -71,7 +75,7 @@
         # pylint: disable=protected-access
         self.assertTrue(ts_mon_config._WasSetup)
 
-
+  @unittest.skipIf(sys.version_info.major < 3, 'Requires py3')
   def testResetAfter(self):
     """Tests that the reset_after flag works to send metrics only once."""
     # By mocking out its "time" module, the forked flushing process will think

lib/ts_mon_config.py

diff --git a/lib/ts_mon_config.py b/lib/ts_mon_config.py
index d2d6220..0440cdc 100644
--- a/lib/ts_mon_config.py
+++ b/lib/ts_mon_config.py
@@ -13,6 +13,7 @@
 import os
 import socket
 import signal
+import sys
 import time
 
 from six.moves import queue as Queue
@@ -34,6 +35,9 @@
   logging.warning('Failed to import ts_mon, monitoring is disabled: %s', e)
 
 
+assert sys.version_info >= (3, 6), 'This module requires Python 3.6+'
+
+
 _WasSetup = False
 _CommonMetricFields = {}
 

lib/ts_mon_config_unittest

diff --git a/lib/ts_mon_config_unittest b/lib/ts_mon_config_unittest
deleted file mode 120000
index 72196ce..0000000
--- a/lib/ts_mon_config_unittest
+++ /dev/null
@@ -1 +0,0 @@
-../scripts/wrapper.py
\ No newline at end of file

lib/ts_mon_config_unittest.py

diff --git a/lib/ts_mon_config_unittest.py b/lib/ts_mon_config_unittest.py
index 9581fef..2ccd0e9 100644
--- a/lib/ts_mon_config_unittest.py
+++ b/lib/ts_mon_config_unittest.py
@@ -9,6 +9,7 @@
 
 import itertools
 import multiprocessing
+import sys
 
 from six.moves import queue as Queue
 
@@ -19,6 +20,9 @@
 from infra_libs import ts_mon
 
 
+assert sys.version_info >= (3, 6), 'This module requires Python 3.6+'
+
+
 # pylint: disable=protected-access
 DEFAULT_OPTIONS = ts_mon_config._GenerateTsMonArgparseOptions(
     'unittest', False, False, None, 0)