mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2025-08-03 20:14:17 -04:00
Remove Config::createTempFileInstance
This commit is contained in:
parent
fcb32efd05
commit
37ddbb3cd2
12 changed files with 63 additions and 39 deletions
|
@ -30,17 +30,19 @@ QTEST_GUILESS_MAIN(TestSSHAgent)
|
|||
void TestSSHAgent::initTestCase()
|
||||
{
|
||||
QVERIFY(Crypto::init());
|
||||
Config::createTempFileInstance();
|
||||
|
||||
m_agentSocketFile.setAutoRemove(true);
|
||||
QVERIFY(m_agentSocketFile.open());
|
||||
// Create temporary config file
|
||||
Config::createConfigFromFile(TemporaryFile::createTempConfigFile(), {});
|
||||
|
||||
m_agentSocketFileName = m_agentSocketFile.fileName();
|
||||
// default config must not enable agent
|
||||
SSHAgent agent;
|
||||
QVERIFY(!agent.isEnabled());
|
||||
|
||||
m_agentSocketFile.reset(new TemporaryFile(this));
|
||||
|
||||
m_agentSocketFileName = m_agentSocketFile->fileName();
|
||||
QVERIFY(!m_agentSocketFileName.isEmpty());
|
||||
|
||||
// let ssh-agent re-create it as a socket
|
||||
QVERIFY(m_agentSocketFile.remove());
|
||||
|
||||
QStringList arguments;
|
||||
arguments << "-D" << "-a" << m_agentSocketFileName;
|
||||
|
||||
|
@ -85,13 +87,18 @@ void TestSSHAgent::initTestCase()
|
|||
QVERIFY(m_key.parsePKCS1PEM(keyData));
|
||||
}
|
||||
|
||||
void TestSSHAgent::init()
|
||||
{
|
||||
// Reset the config state
|
||||
SSHAgent agent;
|
||||
agent.setEnabled(false);
|
||||
QString empty;
|
||||
agent.setAuthSockOverride(empty);
|
||||
}
|
||||
|
||||
void TestSSHAgent::testConfiguration()
|
||||
{
|
||||
SSHAgent agent;
|
||||
|
||||
// default config must not enable agent
|
||||
QVERIFY(!agent.isEnabled());
|
||||
|
||||
agent.setEnabled(true);
|
||||
QVERIFY(agent.isEnabled());
|
||||
|
||||
|
@ -291,6 +298,4 @@ void TestSSHAgent::cleanupTestCase()
|
|||
m_agentProcess.terminate();
|
||||
m_agentProcess.waitForFinished();
|
||||
}
|
||||
|
||||
m_agentSocketFile.remove();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue