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

[libcalamares] Test command-expansion with environment

Browse Source
This commit is contained in:
Adriaan de Groot 2024-02-24 23:18:35 +01:00
parent 0ced01ddc3
commit 4329b824d4
1 changed files with 53 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/libcalamares/utils/Tests.cpp
View File

@ -12,6 +12,7 @@
#include "CommandList.h" #include "CommandList.h"
#include "Entropy.h" #include "Entropy.h"
#include "Logger.h" #include "Logger.h"
#include "Permissions.h"
#include "RAII.h" #include "RAII.h"
#include "Runner.h" #include "Runner.h"
#include "String.h" #include "String.h"
@ -376,16 +377,61 @@ commands:
} }
} }
void LibCalamaresTests::testCommandRunning() void
LibCalamaresTests::testCommandRunning()
{ {
const QString echoCommand = QStringLiteral("echo \"$calamares_test_variable\"");
Calamares::CommandList l(false); // no chroot QTemporaryDir tempRoot( QDir::tempPath() + QStringLiteral( "/test-job-XXXXXX" ) );
Calamares::CommandLine c(echoCommand, {}, std::chrono::seconds(2)); tempRoot.setAutoRemove( false );
l.push_back(c);
const auto r = l.run(); const QString testExecutable = tempRoot.filePath( "example.sh" );
const auto output = r.readAll(); const QString testFile = tempRoot.filePath( "example.txt" );
{
QFile f( testExecutable );
QVERIFY( f.open( QIODevice::WriteOnly ) );
f.write( "#! /bin/sh\necho \"$calamares_test_variable\"\n" );
f.close();
Calamares::Permissions::apply( testExecutable, 0755 );
}
const QString echoCommand = testExecutable + QStringLiteral( " > " ) + testFile;
// Without an environment, the variable echoed in the example
// executable is empty, and we write a single newline to stdout,
// which is redirected to testFile.
{
Calamares::CommandList l( false ); // no chroot
Calamares::CommandLine c( echoCommand, {}, std::chrono::seconds( 2 ) );
l.push_back( c );
const auto r = l.run();
QVERIFY( bool( r ) );
QCOMPARE( QFileInfo( testFile ).size(), 1 ); // single newline
}
// With an environment, echoes the value of the variable and a newline
{
const QString world = QStringLiteral( "Hello world" );
Calamares::CommandList l( false ); // no chroot
Calamares::CommandLine c(
echoCommand,
{ QStringLiteral( "calamares_test_variable=" ) + QChar( '"' ) + world + QChar( '"' ) },
std::chrono::seconds( 2 ) );
l.push_back( c );
const auto r = l.run();
QVERIFY( bool( r ) );
QCOMPARE( QFileInfo( testFile ).size(), world.length() + 1 ); // plus newline
QFile f( testFile );
QVERIFY( f.open( QIODevice::ReadOnly ) );
QCOMPARE( f.readAll(), world + QChar( '\n' ) );
}
tempRoot.setAutoRemove( true );
} }
void void