libstore: migrate caFile, netrcFile, and downloadSpeed to FileTransferSettings
The `caFile`, `netrcFile`, and `downloadSpeed` settings are only used by the file transfer subsystem but lived in the global `Settings` class. This moves them to `FileTransferSettings` where they belong. Co-authored-by: Amaan Qureshi <git@amaanq.com>
This commit is contained in:
1 parent
46eabe34c2
commit
04d13a96e3
10 files changed
+162
-124
No files matched your search
@@ -80,13 +80,13 @@ void HttpsBinaryCacheStoreTest::SetUp()
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(50));
|
||||
|
||||
/* FIXME: Don't use global settings. Tests are not run concurrently, so this is fine for now. */
|
||||
oldCaCert = settings.caFile;
|
||||
settings.caFile = caCert.string();
|
||||
oldCaCert = fileTransferSettings.caFile;
|
||||
fileTransferSettings.caFile = caCert.string();
|
||||
}
|
||||
|
||||
void HttpsBinaryCacheStoreTest::TearDown()
|
||||
{
|
||||
settings.caFile = oldCaCert;
|
||||
fileTransferSettings.caFile = oldCaCert;
|
||||
serverPid.kill();
|
||||
delTmpDir.reset();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user