applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-07-01 03:15:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[users] Polish up tests

Browse source 
- Don't remove test artifacts on failure
 - Coding style
This commit is contained in:
Adriaan de Groot 2020-02-17 18:21:44 +01:00
parent c5b45c37fc
commit f1435452ea
1 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/modules/users/Tests.cpp
View file

@ -45,6 +45,8 @@ private Q_SLOTS:
void testEtcHostname(); void testEtcHostname();
void testEtcHosts(); void testEtcHosts();
void cleanup();
private: private:
QTemporaryDir m_dir; QTemporaryDir m_dir;
}; };
@ -52,12 +54,10 @@ private:
UsersTests::UsersTests() UsersTests::UsersTests()
: m_dir( QStringLiteral( "/tmp/calamares-usertest" ) ) : m_dir( QStringLiteral( "/tmp/calamares-usertest" ) )
{ {
// Would want to do this if the test fails, automatically.
//
// m_dir.setAutoRemove( false );
} }
void UsersTests::initTestCase() void
UsersTests::initTestCase()
{ {
Logger::setupLogLevel( Logger::LOGDEBUG ); Logger::setupLogLevel( Logger::LOGDEBUG );
cDebug() << "Users test started."; cDebug() << "Users test started.";
@ -80,7 +80,8 @@ void UsersTests::initTestCase()
gs->insert( "rootMountPoint", m_dir.path() ); gs->insert( "rootMountPoint", m_dir.path() );
} }
void UsersTests::testEtcHostname() void
UsersTests::testEtcHostname()
{ {
cDebug() << "Test dir" << m_dir.path(); cDebug() << "Test dir" << m_dir.path();
@ -98,10 +99,11 @@ void UsersTests::testEtcHostname()
QVERIFY( QFile::exists( m_dir.filePath( "etc/hostname" ) ) ); QVERIFY( QFile::exists( m_dir.filePath( "etc/hostname" ) ) );
// 22 for the test string, above, and 1 for the newline // 22 for the test string, above, and 1 for the newline
QCOMPARE( QFileInfo( m_dir.filePath("etc/hostname") ).size(), 22 + 1); QCOMPARE( QFileInfo( m_dir.filePath( "etc/hostname" ) ).size(), 22 + 1 );
} }
void UsersTests::testEtcHosts() void
UsersTests::testEtcHosts()
{ {
// Assume previous tests did their work // Assume previous tests did their work
QVERIFY( QFile::exists( m_dir.path() ) ); QVERIFY( QFile::exists( m_dir.path() ) );
@ -111,9 +113,17 @@ void UsersTests::testEtcHosts()
QVERIFY( QFile::exists( m_dir.filePath( "etc/hosts" ) ) ); QVERIFY( QFile::exists( m_dir.filePath( "etc/hosts" ) ) );
// The skeleton contains %1 which has the hostname substituted in, so we lose two, // The skeleton contains %1 which has the hostname substituted in, so we lose two,
// and the rest of the blabla is 150 (according to Python) // and the rest of the blabla is 150 (according to Python)
QCOMPARE( QFileInfo( m_dir.filePath("etc/hosts") ).size(), 150 + 22 - 2 ); QCOMPARE( QFileInfo( m_dir.filePath( "etc/hosts" ) ).size(), 150 + 22 - 2 );
} }
void
UsersTests::cleanup()
{
if ( QTest::currentTestFailed() )
{
m_dir.setAutoRemove( false );
}
}
QTEST_GUILESS_MAIN( UsersTests ) QTEST_GUILESS_MAIN( UsersTests )
@ -121,4 +131,3 @@ QTEST_GUILESS_MAIN( UsersTests )
#include "utils/moc-warnings.h" #include "utils/moc-warnings.h"
#include "Tests.moc" #include "Tests.moc"