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

[shellprocess] Don't crash test

Browse Source 
- May need to create a JobQueue before doing anything internal
 - May need to create global settings
 - Chroot always needs rootMountPath internally
This commit is contained in:
Adriaan de Groot 2018-05-23 09:53:03 -04:00
parent 8b00a03423
commit 87b9c42158
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/modules/shellprocess/Tests.cpp
View File

@ -18,7 +18,11 @@
#include "Tests.h" #include "Tests.h"
#include "JobQueue.h"
#include "Settings.h"
#include "utils/CommandList.h" #include "utils/CommandList.h"
#include "utils/Logger.h"
#include "utils/YamlUtils.h" #include "utils/YamlUtils.h"
#include <yaml-cpp/yaml.h> #include <yaml-cpp/yaml.h>
@ -158,7 +162,17 @@ script:
)" ); )" );
QVariant script = CalamaresUtils::yamlMapToVariant( doc ).toMap().value( "script" ); QVariant script = CalamaresUtils::yamlMapToVariant( doc ).toMap().value( "script" );
if ( !Calamares::JobQueue::instance() )
(void *)new Calamares::JobQueue( nullptr );
if ( !Calamares::Settings::instance() )
(void *)new Calamares::Settings( QString(), true );
Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
QVERIFY( gs != nullptr );
// Doesn't use @@ROOT@@, so no failures // Doesn't use @@ROOT@@, so no failures
QVERIFY( bool(CommandList(script, true, 10 ).run()) );
QVERIFY( bool(CommandList(script, false, 10 ).run()) ); QVERIFY( bool(CommandList(script, false, 10 ).run()) );
// Doesn't use @@ROOT@@, but does chroot, so fails
QVERIFY( !bool(CommandList(script, true, 10 ).run()) );
} }