commit f0146256f74e582aa794b8f211084c40c43038a5
author Mike Frysinger <vapier@chromium.org> Mon Sep 02 13:31:05 2019 -0400
committer Mike Frysinger <vapier@chromium.org> Mon Sep 02 23:29:56 2019 +0000
tree 313c369f82d36cc1d40e1b785930550699e380d7
parent d3e9d0596b1e20b30f1ee45133d4853d94346abc

cbuildbot_launch: add debugging logic to cleanup timeout

The chroot cleanup is timing out on bots.  Add some debugging
logic for when this happens to try & figure out what's going on.

BUG=chromium:1000034
TEST=precq passes

Change-Id: I999c166da36f1f1075bab226661bb2f22bb9990f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1780892
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

scripts/cbuildbot_launch_unittest.py

diff --git a/scripts/cbuildbot_launch_unittest.py b/scripts/cbuildbot_launch_unittest.py
index d48d34b..46e08bc 100644
--- a/scripts/cbuildbot_launch_unittest.py
+++ b/scripts/cbuildbot_launch_unittest.py
@@ -19,6 +19,7 @@
 from chromite.lib import cros_sdk_lib
 from chromite.lib import cros_test_lib
 from chromite.lib import osutils
+from chromite.lib import timeout_util
 from chromite.scripts import cbuildbot_launch
 
 EXPECTED_MANIFEST_URL = 'https://chrome-internal-review.googlesource.com/chromeos/manifest-internal'  # pylint: disable=line-too-long
@@ -201,8 +202,7 @@
         mock.call('/root', expected_build_state)])
 
     # Ensure we clean the chroot, as expected.
-    self.assertEqual(mock_cleanup_chroot.mock_calls, [
-        mock.call('/root/repository')])
+    mock_cleanup_chroot.assert_called_once_with('/root/repository')
 
   def testMainMax(self):
     """Test a larger set of command line options."""
@@ -306,8 +306,7 @@
         mock.call('/root', final_state)])
 
     # Ensure we clean the chroot, as expected.
-    self.assertEqual(mock_cleanup_chroot.mock_calls, [
-        mock.call('/root/repository')])
+    mock_cleanup_chroot.assert_called_once_with('/root/repository')
 
 
 class CleanBuildRootTest(cros_test_lib.MockTempDirTestCase):
@@ -749,3 +748,30 @@
     new_state.from_json(saved_state)
 
     self.assertEqual(old_state, new_state)
+
+  def testCleanupChrootNoChroot(self):
+    """Check CleanupChroot without a chroot."""
+    self.StartPatcher(cros_test_lib.RunCommandMock())
+    with mock.patch.object(cros_sdk_lib, 'CleanupChrootMount'):
+      ret = cbuildbot_launch.CleanupChroot(self.buildroot)
+      self.assertTrue(ret)
+
+  def testCleanupChrootNormal(self):
+    """Check normal CleanupChroot."""
+    osutils.SafeMakedirs(self.chroot)
+    osutils.Touch(self.chroot + '.img')
+    self.StartPatcher(cros_test_lib.RunCommandMock())
+    with mock.patch.object(cros_sdk_lib, 'CleanupChrootMount'):
+      ret = cbuildbot_launch.CleanupChroot(self.buildroot)
+      self.assertTrue(ret)
+
+  def testCleanupChrootTimeout(self):
+    """Check timeouts in CleanupChroot."""
+    osutils.SafeMakedirs(self.chroot)
+    osutils.Touch(self.chroot + '.img')
+    rc_mock = self.StartPatcher(cros_test_lib.RunCommandMock())
+    rc_mock.SetDefaultCmdResult()
+    with mock.patch.object(cros_sdk_lib, 'CleanupChrootMount',
+                           side_effect=timeout_util.TimeoutError):
+      ret = cbuildbot_launch.CleanupChroot(self.buildroot)
+      self.assertFalse(ret)