diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-22 21:05:08 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-22 21:05:08 +0000 |
| commit | c6196f6d4bcc10b3b6065cbe58b52aa57200bb64 (patch) | |
| tree | 8fbee3b0ecf8268601fa73e9efdd7fca3ba5c4b1 /chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc | |
| parent | 27f53c1e40c8078159d0ddc11a0ea02dba94c257 (diff) | |
| download | chromium_src-c6196f6d4bcc10b3b6065cbe58b52aa57200bb64.zip chromium_src-c6196f6d4bcc10b3b6065cbe58b52aa57200bb64.tar.gz chromium_src-c6196f6d4bcc10b3b6065cbe58b52aa57200bb64.tar.bz2 | |
Remove a sleep from SandboxedExtensionUnpackerTest.WithCatalogsSuccess.
Previously the test: (1) wrote a file, (2) slept, (3) wrote a file,
(4) checked that the file time changed.
I modified it so step 2 instead just sets the file mod time into the
past.
BUG=46246
Review URL: http://codereview.chromium.org/3464012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60221 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc')
| -rw-r--r-- | chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc b/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc index 30d47eb..d461ff4 100644 --- a/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc +++ b/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc @@ -176,18 +176,19 @@ TEST_F(SandboxedExtensionUnpackerTest, WithCatalogsSuccess) { ASSERT_TRUE(unpacker_->DumpImagesToFile()); ASSERT_TRUE(unpacker_->DumpMessageCatalogsToFile()); - // Check timestamp on _locales/en_US/messages.json. + // Set timestamp on _locales/en_US/messages.json into the past. FilePath messages_file; messages_file = GetInstallPath().Append(Extension::kLocaleFolder) .AppendASCII("en_US") .Append(Extension::kMessagesFilename); base::PlatformFileInfo old_info; EXPECT_TRUE(file_util::GetFileInfo(messages_file, &old_info)); + base::Time old_time = + old_info.last_modified - base::TimeDelta::FromSeconds(2); + EXPECT_TRUE(file_util::SetLastModifiedTime(messages_file, old_time)); + // Refresh old_info, just to be sure. + EXPECT_TRUE(file_util::GetFileInfo(messages_file, &old_info)); - // unpacker_->Run unpacks the extension. OnUnpackSucceeded overwrites some - // of the files. To force timestamp on overwriten files to be different we use - // Sleep(1s). See comment on file_util::CountFilesCreatedAfter. - PlatformThread::Sleep(1000); OnUnpackSucceeded(); // Check that there is newer _locales/en_US/messages.json file. |