Skip to content

GitLab

T
tangled
Commit 5a1b0c8d authored by tzik@chromium.org's avatar tzik@chromium.org
Browse files
Options

[SyncFS] Disable quota management on tests 

BUG=331988

Review URL: https://codereview.chromium.org/147843007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247986 0039d316-1c4b-4281-b951-d872f2087c98
parent 0ff2ad7d
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 26 deletions
chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
View file @ 5a1b0c8d
...@@ -146,7 +146,7 @@ class DriveBackendSyncTest : public testing::Test { ...@@ -146,7 +146,7 @@ class DriveBackendSyncTest : public testing::Test {
CannedSyncableFileSystem* file_system = new CannedSyncableFileSystem( CannedSyncableFileSystem* file_system = new CannedSyncableFileSystem(
origin, in_memory_env_.get(), origin, in_memory_env_.get(),
io_task_runner_.get(), file_task_runner_.get()); io_task_runner_.get(), file_task_runner_.get());
file_system->SetUp(); file_system->SetUp(CannedSyncableFileSystem::QUOTA_DISABLED);
SyncStatusCode status = SYNC_STATUS_UNKNOWN; SyncStatusCode status = SYNC_STATUS_UNKNOWN;
local_sync_service_->MaybeInitializeFileSystemContext( local_sync_service_->MaybeInitializeFileSystemContext(
......
chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service_sync_unittest.cc
View file @ 5a1b0c8d
...@@ -130,7 +130,7 @@ class DriveFileSyncServiceSyncTest : public testing::Test { ...@@ -130,7 +130,7 @@ class DriveFileSyncServiceSyncTest : public testing::Test {
.get()); .get());
SyncStatusCode status = SYNC_STATUS_UNKNOWN; SyncStatusCode status = SYNC_STATUS_UNKNOWN;
file_system->SetUp(); file_system->SetUp(CannedSyncableFileSystem::QUOTA_ENABLED);
local_sync_service_->MaybeInitializeFileSystemContext( local_sync_service_->MaybeInitializeFileSystemContext(
origin, file_system->file_system_context(), origin, file_system->file_system_context(),
CreateResultReceiver(&status)); CreateResultReceiver(&status));
......
chrome/browser/sync_file_system/local/canned_syncable_file_system.cc
View file @ 5a1b0c8d
...@@ -222,18 +222,20 @@ CannedSyncableFileSystem::CannedSyncableFileSystem( ...@@ -222,18 +222,20 @@ CannedSyncableFileSystem::CannedSyncableFileSystem(
CannedSyncableFileSystem::~CannedSyncableFileSystem() {} CannedSyncableFileSystem::~CannedSyncableFileSystem() {}
void CannedSyncableFileSystem::SetUp() { void CannedSyncableFileSystem::SetUp(QuotaMode quota_mode) {
ASSERT_FALSE(is_filesystem_set_up_); ASSERT_FALSE(is_filesystem_set_up_);
ASSERT_TRUE(data_dir_.CreateUniqueTempDir()); ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
scoped_refptr<quota::SpecialStoragePolicy> storage_policy = scoped_refptr<quota::SpecialStoragePolicy> storage_policy =
new quota::MockSpecialStoragePolicy(); new quota::MockSpecialStoragePolicy();
quota_manager_ = new QuotaManager(false /* is_incognito */, if (quota_mode == QUOTA_ENABLED) {
data_dir_.path(), quota_manager_ = new QuotaManager(false /* is_incognito */,
io_task_runner_.get(), data_dir_.path(),
base::MessageLoopProxy::current().get(), io_task_runner_.get(),
storage_policy.get()); base::MessageLoopProxy::current().get(),
storage_policy.get());
}
std::vector<std::string> additional_allowed_schemes; std::vector<std::string> additional_allowed_schemes;
additional_allowed_schemes.push_back(origin_.scheme()); additional_allowed_schemes.push_back(origin_.scheme());
...@@ -250,7 +252,7 @@ void CannedSyncableFileSystem::SetUp() { ...@@ -250,7 +252,7 @@ void CannedSyncableFileSystem::SetUp() {
file_task_runner_.get(), file_task_runner_.get(),
fileapi::ExternalMountPoints::CreateRefCounted().get(), fileapi::ExternalMountPoints::CreateRefCounted().get(),
storage_policy.get(), storage_policy.get(),
quota_manager_->proxy(), quota_manager_ ? quota_manager_->proxy() : NULL,
additional_backends.Pass(), additional_backends.Pass(),
data_dir_.path(), options); data_dir_.path(), options);
...@@ -708,6 +710,7 @@ void CannedSyncableFileSystem::DoGetUsageAndQuota( ...@@ -708,6 +710,7 @@ void CannedSyncableFileSystem::DoGetUsageAndQuota(
const quota::StatusCallback& callback) { const quota::StatusCallback& callback) {
EXPECT_TRUE(io_task_runner_->RunsTasksOnCurrentThread()); EXPECT_TRUE(io_task_runner_->RunsTasksOnCurrentThread());
EXPECT_TRUE(is_filesystem_opened_); EXPECT_TRUE(is_filesystem_opened_);
DCHECK(quota_manager_);
quota_manager_->GetUsageAndQuota( quota_manager_->GetUsageAndQuota(
origin_, storage_type(), origin_, storage_type(),
base::Bind(&DidGetUsageAndQuota, callback, usage, quota)); base::Bind(&DidGetUsageAndQuota, callback, usage, quota));
......
chrome/browser/sync_file_system/local/canned_syncable_file_system.h
View file @ 5a1b0c8d
...@@ -67,6 +67,11 @@ class CannedSyncableFileSystem ...@@ -67,6 +67,11 @@ class CannedSyncableFileSystem
typedef base::Callback<void(int64)> WriteCallback; typedef base::Callback<void(int64)> WriteCallback;
typedef fileapi::FileSystemOperation::FileEntryList FileEntryList; typedef fileapi::FileSystemOperation::FileEntryList FileEntryList;
enum QuotaMode {
QUOTA_ENABLED,
QUOTA_DISABLED,
};
CannedSyncableFileSystem(const GURL& origin, CannedSyncableFileSystem(const GURL& origin,
leveldb::Env* env_override, leveldb::Env* env_override,
base::SingleThreadTaskRunner* io_task_runner, base::SingleThreadTaskRunner* io_task_runner,
...@@ -74,7 +79,7 @@ class CannedSyncableFileSystem ...@@ -74,7 +79,7 @@ class CannedSyncableFileSystem
virtual ~CannedSyncableFileSystem(); virtual ~CannedSyncableFileSystem();
// SetUp must be called before using this instance. // SetUp must be called before using this instance.
void SetUp(); void SetUp(QuotaMode quota_mode);
// TearDown must be called before destructing this instance. // TearDown must be called before destructing this instance.
void TearDown(); void TearDown();
......
chrome/browser/sync_file_system/local/local_file_change_tracker_unittest.cc
View file @ 5a1b0c8d
...@@ -43,7 +43,7 @@ class LocalFileChangeTrackerTest : public testing::Test { ...@@ -43,7 +43,7 @@ class LocalFileChangeTrackerTest : public testing::Test {
base::MessageLoopProxy::current().get()) {} base::MessageLoopProxy::current().get()) {}
virtual void SetUp() OVERRIDE { virtual void SetUp() OVERRIDE {
file_system_.SetUp(); file_system_.SetUp(CannedSyncableFileSystem::QUOTA_ENABLED);
sync_context_ = sync_context_ =
new LocalFileSyncContext(base::FilePath(), new LocalFileSyncContext(base::FilePath(),
......
chrome/browser/sync_file_system/local/local_file_sync_context_unittest.cc
View file @ 5a1b0c8d
...@@ -234,7 +234,7 @@ class LocalFileSyncContextTest : public testing::Test { ...@@ -234,7 +234,7 @@ class LocalFileSyncContextTest : public testing::Test {
in_memory_env_.get(), in_memory_env_.get(),
io_task_runner_.get(), io_task_runner_.get(),
file_task_runner_.get()); file_task_runner_.get());
file_system.SetUp(); file_system.SetUp(CannedSyncableFileSystem::QUOTA_ENABLED);
sync_context_ = new LocalFileSyncContext( sync_context_ = new LocalFileSyncContext(
dir_.path(), in_memory_env_.get(), dir_.path(), in_memory_env_.get(),
ui_task_runner_.get(), io_task_runner_.get()); ui_task_runner_.get(), io_task_runner_.get());
...@@ -286,7 +286,7 @@ class LocalFileSyncContextTest : public testing::Test { ...@@ -286,7 +286,7 @@ class LocalFileSyncContextTest : public testing::Test {
in_memory_env_.get(), in_memory_env_.get(),
io_task_runner_.get(), io_task_runner_.get(),
file_task_runner_.get()); file_task_runner_.get());
file_system.SetUp(); file_system.SetUp(CannedSyncableFileSystem::QUOTA_ENABLED);
sync_context_ = new LocalFileSyncContext( sync_context_ = new LocalFileSyncContext(
dir_.path(), in_memory_env_.get(), dir_.path(), in_memory_env_.get(),
ui_task_runner_.get(), io_task_runner_.get()); ui_task_runner_.get(), io_task_runner_.get());
...@@ -378,7 +378,7 @@ TEST_F(LocalFileSyncContextTest, InitializeFileSystemContext) { ...@@ -378,7 +378,7 @@ TEST_F(LocalFileSyncContextTest, InitializeFileSystemContext) {
in_memory_env_.get(), in_memory_env_.get(),
io_task_runner_.get(), io_task_runner_.get(),
file_task_runner_.get()); file_task_runner_.get());
file_system.SetUp(); file_system.SetUp(CannedSyncableFileSystem::QUOTA_ENABLED);
sync_context_ = new LocalFileSyncContext( sync_context_ = new LocalFileSyncContext(
dir_.path(), in_memory_env_.get(), dir_.path(), in_memory_env_.get(),
...@@ -425,8 +425,8 @@ TEST_F(LocalFileSyncContextTest, MultipleFileSystemContexts) { ...@@ -425,8 +425,8 @@ TEST_F(LocalFileSyncContextTest, MultipleFileSystemContexts) {
in_memory_env_.get(), in_memory_env_.get(),
io_task_runner_.get(), io_task_runner_.get(),
file_task_runner_.get()); file_task_runner_.get());
file_system1.SetUp(); file_system1.SetUp(CannedSyncableFileSystem::QUOTA_ENABLED);
file_system2.SetUp(); file_system2.SetUp(CannedSyncableFileSystem::QUOTA_ENABLED);
sync_context_ = new LocalFileSyncContext( sync_context_ = new LocalFileSyncContext(
dir_.path(), in_memory_env_.get(), dir_.path(), in_memory_env_.get(),
...@@ -540,7 +540,7 @@ TEST_F(LocalFileSyncContextTest, DISABLED_PrepareSyncWhileWriting) { ...@@ -540,7 +540,7 @@ TEST_F(LocalFileSyncContextTest, DISABLED_PrepareSyncWhileWriting) {
in_memory_env_.get(), in_memory_env_.get(),
io_task_runner_.get(), io_task_runner_.get(),
file_task_runner_.get()); file_task_runner_.get());
file_system.SetUp(); file_system.SetUp(CannedSyncableFileSystem::QUOTA_ENABLED);
sync_context_ = new LocalFileSyncContext( sync_context_ = new LocalFileSyncContext(
dir_.path(), in_memory_env_.get(), dir_.path(), in_memory_env_.get(),
ui_task_runner_.get(), io_task_runner_.get()); ui_task_runner_.get(), io_task_runner_.get());
...@@ -603,7 +603,7 @@ TEST_F(LocalFileSyncContextTest, ApplyRemoteChangeForDeletion) { ...@@ -603,7 +603,7 @@ TEST_F(LocalFileSyncContextTest, ApplyRemoteChangeForDeletion) {
in_memory_env_.get(), in_memory_env_.get(),
io_task_runner_.get(), io_task_runner_.get(),
file_task_runner_.get()); file_task_runner_.get());
file_system.SetUp(); file_system.SetUp(CannedSyncableFileSystem::QUOTA_ENABLED);
sync_context_ = new LocalFileSyncContext( sync_context_ = new LocalFileSyncContext(
dir_.path(), in_memory_env_.get(), dir_.path(), in_memory_env_.get(),
...@@ -691,7 +691,7 @@ TEST_F(LocalFileSyncContextTest, ApplyRemoteChangeForDeletion_ForRoot) { ...@@ -691,7 +691,7 @@ TEST_F(LocalFileSyncContextTest, ApplyRemoteChangeForDeletion_ForRoot) {
in_memory_env_.get(), in_memory_env_.get(),
io_task_runner_.get(), io_task_runner_.get(),
file_task_runner_.get()); file_task_runner_.get());
file_system.SetUp(); file_system.SetUp(CannedSyncableFileSystem::QUOTA_ENABLED);
sync_context_ = new LocalFileSyncContext( sync_context_ = new LocalFileSyncContext(
dir_.path(), in_memory_env_.get(), dir_.path(), in_memory_env_.get(),
...@@ -761,7 +761,7 @@ TEST_F(LocalFileSyncContextTest, ApplyRemoteChangeForAddOrUpdate) { ...@@ -761,7 +761,7 @@ TEST_F(LocalFileSyncContextTest, ApplyRemoteChangeForAddOrUpdate) {
in_memory_env_.get(), in_memory_env_.get(),
io_task_runner_.get(), io_task_runner_.get(),
file_task_runner_.get()); file_task_runner_.get());
file_system.SetUp(); file_system.SetUp(CannedSyncableFileSystem::QUOTA_ENABLED);
sync_context_ = new LocalFileSyncContext( sync_context_ = new LocalFileSyncContext(
dir_.path(), in_memory_env_.get(), dir_.path(), in_memory_env_.get(),
...@@ -912,7 +912,7 @@ TEST_F(LocalFileSyncContextTest, ApplyRemoteChangeForAddOrUpdate_NoParent) { ...@@ -912,7 +912,7 @@ TEST_F(LocalFileSyncContextTest, ApplyRemoteChangeForAddOrUpdate_NoParent) {
in_memory_env_.get(), in_memory_env_.get(),
io_task_runner_.get(), io_task_runner_.get(),
file_task_runner_.get()); file_task_runner_.get());
file_system.SetUp(); file_system.SetUp(CannedSyncableFileSystem::QUOTA_ENABLED);
sync_context_ = new LocalFileSyncContext( sync_context_ = new LocalFileSyncContext(
dir_.path(), in_memory_env_.get(), dir_.path(), in_memory_env_.get(),
......
chrome/browser/sync_file_system/local/local_file_sync_service_unittest.cc
View file @ 5a1b0c8d
...@@ -122,7 +122,7 @@ class LocalFileSyncServiceTest ...@@ -122,7 +122,7 @@ class LocalFileSyncServiceTest
local_service_ = LocalFileSyncService::CreateForTesting( local_service_ = LocalFileSyncService::CreateForTesting(
&profile_, in_memory_env_.get()); &profile_, in_memory_env_.get());
file_system_->SetUp(); file_system_->SetUp(CannedSyncableFileSystem::QUOTA_ENABLED);
base::RunLoop run_loop; base::RunLoop run_loop;
SyncStatusCode status = SYNC_STATUS_UNKNOWN; SyncStatusCode status = SYNC_STATUS_UNKNOWN;
...@@ -302,7 +302,7 @@ TEST_F(LocalFileSyncServiceTest, MAYBE_LocalChangeObserverMultipleContexts) { ...@@ -302,7 +302,7 @@ TEST_F(LocalFileSyncServiceTest, MAYBE_LocalChangeObserverMultipleContexts) {
in_memory_env_.get(), in_memory_env_.get(),
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO), BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)); BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
file_system2.SetUp(); file_system2.SetUp(CannedSyncableFileSystem::QUOTA_ENABLED);
base::RunLoop run_loop; base::RunLoop run_loop;
SyncStatusCode status = SYNC_STATUS_UNKNOWN; SyncStatusCode status = SYNC_STATUS_UNKNOWN;
......
chrome/browser/sync_file_system/local/syncable_file_operation_runner_unittest.cc
View file @ 5a1b0c8d
...@@ -65,7 +65,7 @@ class SyncableFileOperationRunnerTest : public testing::Test { ...@@ -65,7 +65,7 @@ class SyncableFileOperationRunnerTest : public testing::Test {
virtual void SetUp() OVERRIDE { virtual void SetUp() OVERRIDE {
ASSERT_TRUE(dir_.CreateUniqueTempDir()); ASSERT_TRUE(dir_.CreateUniqueTempDir());
file_system_.SetUp(); file_system_.SetUp(CannedSyncableFileSystem::QUOTA_ENABLED);
sync_context_ = new LocalFileSyncContext( sync_context_ = new LocalFileSyncContext(
dir_.path(), dir_.path(),
in_memory_env_.get(), in_memory_env_.get(),
......
chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc
View file @ 5a1b0c8d
...@@ -44,7 +44,7 @@ class SyncableFileSystemTest : public testing::Test { ...@@ -44,7 +44,7 @@ class SyncableFileSystemTest : public testing::Test {
virtual void SetUp() { virtual void SetUp() {
ASSERT_TRUE(data_dir_.CreateUniqueTempDir()); ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
file_system_.SetUp(); file_system_.SetUp(CannedSyncableFileSystem::QUOTA_ENABLED);
sync_context_ = sync_context_ =
new LocalFileSyncContext(data_dir_.path(), new LocalFileSyncContext(data_dir_.path(),
......
chrome/browser/sync_file_system/sync_file_system_service_unittest.cc
View file @ 5a1b0c8d
...@@ -154,7 +154,7 @@ class SyncFileSystemServiceTest : public testing::Test { ...@@ -154,7 +154,7 @@ class SyncFileSystemServiceTest : public testing::Test {
EXPECT_CALL(*mock_remote_service(), SetSyncEnabled(false)).Times(1); EXPECT_CALL(*mock_remote_service(), SetSyncEnabled(false)).Times(1);
sync_service_->SetSyncEnabledForTesting(false); sync_service_->SetSyncEnabledForTesting(false);
file_system_->SetUp(); file_system_->SetUp(CannedSyncableFileSystem::QUOTA_ENABLED);
} }
virtual void TearDown() OVERRIDE { virtual void TearDown() OVERRIDE {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment