diff options
| author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-09 21:57:38 +0000 |
|---|---|---|
| committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-09 21:57:38 +0000 |
| commit | 7995d0f9a801cf8378ba0618f61b7746d615fb4d (patch) | |
| tree | ce5073ca4b5ea02234fd71302d56224241f8f5b7 | |
| parent | 40fff2b90e49b46ac424ff0de7f23447b77f0dce (diff) | |
| download | chromium_src-7995d0f9a801cf8378ba0618f61b7746d615fb4d.zip chromium_src-7995d0f9a801cf8378ba0618f61b7746d615fb4d.tar.gz chromium_src-7995d0f9a801cf8378ba0618f61b7746d615fb4d.tar.bz2 | |
Mac: Re-enable MacDirAccessSandboxTest.SandboxAccess
The test failure was likely caused by an infrastructure issue.
BUG=89170
TEST=All unit tests should pass.
TBR=thakis@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10389038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136140 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/common/sandbox_mac.h | 2 | ||||
| -rw-r--r-- | content/common/sandbox_mac_diraccess_unittest.mm | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/content/common/sandbox_mac.h b/content/common/sandbox_mac.h index 399790f..60c94ed 100644 --- a/content/common/sandbox_mac.h +++ b/content/common/sandbox_mac.h @@ -152,7 +152,7 @@ class CONTENT_EXPORT Sandbox { FRIEND_TEST_ALL_PREFIXES(MacDirAccessSandboxTest, StringEscape); FRIEND_TEST_ALL_PREFIXES(MacDirAccessSandboxTest, RegexEscape); - FRIEND_TEST_ALL_PREFIXES(MacDirAccessSandboxTest, DISABLED_SandboxAccess); + FRIEND_TEST_ALL_PREFIXES(MacDirAccessSandboxTest, SandboxAccess); DISALLOW_IMPLICIT_CONSTRUCTORS(Sandbox); }; diff --git a/content/common/sandbox_mac_diraccess_unittest.mm b/content/common/sandbox_mac_diraccess_unittest.mm index 302147b..868bc9a 100644 --- a/content/common/sandbox_mac_diraccess_unittest.mm +++ b/content/common/sandbox_mac_diraccess_unittest.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -142,8 +142,7 @@ class ScopedDirectoryDelete { typedef scoped_ptr_malloc<FilePath, ScopedDirectoryDelete> ScopedDirectory; -// Disabled as times out, taking out remaining tests: 89170. -TEST_F(MacDirAccessSandboxTest, DISABLED_SandboxAccess) { +TEST_F(MacDirAccessSandboxTest, SandboxAccess) { using file_util::CreateDirectory; FilePath tmp_dir; |