commit c7ba784494867f7fd4df44a556b2c8f80d90def4
author David Pursell <dpursell@chromium.org> Wed Jul 08 10:48:41 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Fri Jul 10 23:12:41 2015 +0000
tree 35f9d15bf3bc2bf22b498986c86ea6be5399f538
parent bfb3353ec5f07b2abaf44eb39e44b4f2b482c532

chromite: Remove GetToolset() function.

GetToolset() was used to switch functionality between `cros` and
`brillo`, so is no longer needed.

BUG=chromium:507323
TEST=cbuildbot/run_tests
TEST=cros --help

Change-Id: I652d4e5a2abcf3e318bc0233ae3c53b6b2fd29fb
Reviewed-on: https://chromium-review.googlesource.com/284169
Reviewed-by: David Pursell <dpursell@chromium.org>
Tested-by: David Pursell <dpursell@chromium.org>
Commit-Queue: David Pursell <dpursell@chromium.org>

scripts/cros_unittest.py

diff --git a/scripts/cros_unittest.py b/scripts/cros_unittest.py
index 4a46b28..7510fca 100644
--- a/scripts/cros_unittest.py
+++ b/scripts/cros_unittest.py
@@ -6,7 +6,6 @@
 
 from __future__ import print_function
 
-from chromite.cli import command
 from chromite.lib import commandline
 from chromite.lib import cros_test_lib
 from chromite.lib import stats
@@ -21,10 +20,6 @@
     self.stats_module_mock = stats_unittest.StatsModuleMock()
     self.StartPatcher(self.stats_module_mock)
     self.PatchObject(cros, '_RunSubCommand', autospec=True)
-    # Use the `cros` toolset for these tests.
-    self.get_toolset_mock = self.PatchObject(command, 'GetToolset',
-                                             autospec=True)
-    self.get_toolset_mock.return_value = 'cros'
 
   def testStatsUpload(self, upload_count=1, return_value=0):
     """Test stats uploading."""
@@ -40,17 +35,8 @@
     with cros_test_lib.LoggingCapturer():
       self.testStatsUpload(upload_count=0)
 
-  def testDefaultLogLevelBrillo(self):
-    """Test that the default log level is notice for brillo tools."""
-    self.get_toolset_mock.return_value = 'brillo'
-    self.CreateWorkspace()
-    arg_parser = self.PatchObject(commandline, 'ArgumentParser',
-                                  return_value=commandline.ArgumentParser())
-    cros.GetOptions({})
-    arg_parser.assert_called_with(caching=True, default_log_level='notice')
-
-  def testDefaultLogLevelCros(self):
-    """Test that the default log level is set to notice for cros tools."""
+  def testDefaultLogLevel(self):
+    """Test that the default log level is set to notice."""
     arg_parser = self.PatchObject(commandline, 'ArgumentParser',
                                   return_value=commandline.ArgumentParser())
     cros.GetOptions({})