commit b4b6f6b12be084c9cb49aa835f69687c84bd8c86
author Michael Krebs <mkrebs@chromium.org> Wed Aug 03 13:52:19 2011 -0700
committer Michael Krebs <mkrebs@chromium.org> Thu Aug 04 15:23:01 2011 -0700
tree 94568b2ea39b28a8b9c10442c366154b912e5ee1
parent 0d714b0c18c831cd873a6c655a523e7f2dd594a8

Create consent file after policy file.

Create the consent file *after* the policy file in order to avoid a race
condition where chrome might remove the consent file if the policy's not set
yet.

BUG=chromium-os:18413
TEST=Ran logging_UserCrash remote test.

Change-Id: Ifa0f0da5482d7276f69c05b80bb99e7ec96230c6
Reviewed-on: http://gerrit.chromium.org/gerrit/5234
Reviewed-by: Ken Mixter <kmixter@chromium.org>
Tested-by: Michael Krebs <mkrebs@chromium.org>

client/cros/crash_test.py

diff --git a/client/cros/crash_test.py b/client/cros/crash_test.py
index 09021d5..f307711 100644
--- a/client/cros/crash_test.py
+++ b/client/cros/crash_test.py
@@ -180,18 +180,26 @@
             has_consent: True to indicate consent, False otherwise
         """
         if has_consent:
+            # Create policy file that enables metrics/consent.
+            shutil.copy('/usr/local/autotest/cros/mock_metrics_on.policy',
+                        self._POLICY_FILE)
+            shutil.copy('/usr/local/autotest/cros/mock_metrics_owner.key',
+                        self._OWNER_KEY_FILE)
+            # Create deprecated consent file.  This is created *after* the
+            # policy file in order to avoid a race condition where chrome
+            # might remove the consent file if the policy's not set yet.
+            # See crosbug.com/18413.
             utils.open_write_close(self._CONSENT_FILE, 'test-consent')
             utils.system('chown chronos:chronos "%s"' % (self._CONSENT_FILE))
             logging.info('Created ' + self._CONSENT_FILE)
-            shutil.copy('/usr/local/autotest/cros/mock_metrics_on.policy',
-                        self._POLICY_FILE)
         else:
-            utils.system('rm -f "%s"' % (self._CONSENT_FILE))
+            # Create policy file that disables metrics/consent.
             shutil.copy('/usr/local/autotest/cros/mock_metrics_off.policy',
                         self._POLICY_FILE)
-        """Both policy blobs are signed with the same key."""
-        shutil.copy('/usr/local/autotest/cros/mock_metrics_owner.key',
-                    self._OWNER_KEY_FILE)
+            shutil.copy('/usr/local/autotest/cros/mock_metrics_owner.key',
+                        self._OWNER_KEY_FILE)
+            # Remove deprecated consent file.
+            utils.system('rm -f "%s"' % (self._CONSENT_FILE))
 
 
     def _set_crash_test_in_progress(self, in_progress):