napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libcalamares] Update tests to reflect changed API

Browse Source
This commit is contained in:
Adriaan de Groot 2020-02-14 13:07:29 +01:00
parent 2d7398161d
commit 274115c727
4 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libcalamares/utils/TestPaths.cpp
View File

@ -117,7 +117,10 @@ TestPaths::testTargetPath()
void void
TestPaths::testCreateTarget() TestPaths::testCreateTarget()
{ {
QCOMPARE( m_system->createTargetFile( testFile, "Hello" ), QString( absFile ) ); // Success auto r = m_system->createTargetFile( testFile, "Hello" );
QVERIFY( !r.failed() );
QVERIFY( r );
QCOMPARE( r.path(), QString( absFile ) ); // Success
QFileInfo fi( absFile ); QFileInfo fi( absFile );
QVERIFY( fi.exists() ); QVERIFY( fi.exists() );

2
src/modules/initramfs/InitramfsJob.cpp
View File

@ -54,7 +54,7 @@ InitramfsJob::exec()
// First make sure we generate a safe initramfs with suitable permissions. // First make sure we generate a safe initramfs with suitable permissions.
static const char confFile[] = "/etc/initramfs-tools/conf.d/calamares-safe-initramfs.conf"; static const char confFile[] = "/etc/initramfs-tools/conf.d/calamares-safe-initramfs.conf";
static const char contents[] = "UMASK=0077\n"; static const char contents[] = "UMASK=0077\n";
if ( CalamaresUtils::System::instance()->createTargetFile( confFile, QByteArray( contents ) ).isEmpty() ) if ( CalamaresUtils::System::instance()->createTargetFile( confFile, QByteArray( contents ) ).failed() )
{ {
cWarning() << Logger::SubEntry << "Could not configure safe UMASK for initramfs."; cWarning() << Logger::SubEntry << "Could not configure safe UMASK for initramfs.";
// But continue anyway. // But continue anyway.

24
src/modules/initramfs/Tests.cpp
View File

@ -57,9 +57,12 @@ void InitramfsTests::cleanup()
void InitramfsTests::testCreateHostFile() void InitramfsTests::testCreateHostFile()
{ {
CalamaresUtils::System s( false ); // don't chroot CalamaresUtils::System s( false ); // don't chroot
QString path = s.createTargetFile( confFile, QByteArray( contents ) ); auto r = s.createTargetFile( confFile, QByteArray( contents ) );
QVERIFY( !r.failed() );
QVERIFY( r );
QString path = r.path();
QVERIFY( !path.isEmpty() ); QVERIFY( !path.isEmpty() );
QCOMPARE( path, confFile ); // don't chroot, so path create relative to / QCOMPARE( path, confFile ); // don't chroot, so path create relative to /
QVERIFY( QFile::exists( confFile ) ); QVERIFY( QFile::exists( confFile ) );
@ -67,30 +70,33 @@ void InitramfsTests::testCreateHostFile()
QFileInfo fi( confFile ); QFileInfo fi( confFile );
QVERIFY( fi.exists() ); QVERIFY( fi.exists() );
QCOMPARE( fi.size(), sizeof( contents )-1 ); // don't count trailing NUL QCOMPARE( fi.size(), sizeof( contents )-1 ); // don't count trailing NUL
QFile::remove( confFile ); QFile::remove( confFile );
} }
void InitramfsTests::testCreateTargetFile() void InitramfsTests::testCreateTargetFile()
{ {
static const char short_confFile[] = "/calamares-safe-umask"; static const char short_confFile[] = "/calamares-safe-umask";
CalamaresUtils::System s( true ); CalamaresUtils::System s( true );
QString path = s.createTargetFile( short_confFile, QByteArray( contents ) ); auto r = s.createTargetFile( short_confFile, QByteArray( contents ) );
QVERIFY( r.failed() );
QVERIFY( !r );
QString path = r.path();
QVERIFY( path.isEmpty() ); // because no rootmountpoint is set QVERIFY( path.isEmpty() ); // because no rootmountpoint is set
Calamares::JobQueue j; Calamares::JobQueue j;
j.globalStorage()->insert( "rootMountPoint", "/tmp" ); j.globalStorage()->insert( "rootMountPoint", "/tmp" );
path = s.createTargetFile( short_confFile, QByteArray( contents ) ); path = s.createTargetFile( short_confFile, QByteArray( contents ) );
QVERIFY( path.endsWith( short_confFile ) ); // chroot, so path create relative to QVERIFY( path.endsWith( short_confFile ) ); // chroot, so path create relative to
QVERIFY( path.startsWith( "/tmp/" ) ); QVERIFY( path.startsWith( "/tmp/" ) );
QVERIFY( QFile::exists( path ) ); QVERIFY( QFile::exists( path ) );
QFileInfo fi( path ); QFileInfo fi( path );
QVERIFY( fi.exists() ); QVERIFY( fi.exists() );
QCOMPARE( fi.size(), sizeof( contents )-1 ); // don't count trailing NUL QCOMPARE( fi.size(), sizeof( contents )-1 ); // don't count trailing NUL
QFile::remove( path ); QFile::remove( path );
} }

9
src/modules/machineid/Tests.cpp
View File

@ -122,8 +122,13 @@ MachineIdTests::testJob()
gs->insert( "rootMountPoint", "/tmp" ); gs->insert( "rootMountPoint", "/tmp" );
// Prepare part of the target filesystem // Prepare part of the target filesystem
QVERIFY( system->createTargetDirs("/etc") ); {
QVERIFY( !(system->createTargetFile( "/etc/machine-id", "Hello" ).isEmpty() ) ); QVERIFY( system->createTargetDirs("/etc") );
auto r = system->createTargetFile( "/etc/machine-id", "Hello" );
QVERIFY( !r.failed() );
QVERIFY( r );
QVERIFY( !r.path().isEmpty() );
}
MachineIdJob job( nullptr ); MachineIdJob job( nullptr );
QVERIFY( !job.prettyName().isEmpty() ); QVERIFY( !job.prettyName().isEmpty() );