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

Tests: add language and global-settings options

Browse Source 
- The test-loader can be set to a specific language through the
   -l option (just like the Python one can) and can load a global
   configuration file.
This commit is contained in:
Adriaan de Groot 2019-01-28 07:52:38 -05:00
parent 5e1bcd9b4a
commit 8789b52cb1
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/calamares/testmain.cpp
View File

@ -26,9 +26,10 @@
#include "utils/YamlUtils.h" #include "utils/YamlUtils.h"
#include "modulesystem/Module.h" #include "modulesystem/Module.h"
#include "Settings.h" #include "GlobalStorage.h"
#include "Job.h" #include "Job.h"
#include "JobQueue.h" #include "JobQueue.h"
#include "Settings.h"
#include <QCommandLineOption> #include <QCommandLineOption>
#include <QCommandLineParser> #include <QCommandLineParser>
@ -37,13 +38,17 @@
#include <memory> #include <memory>
struct ModuleConfig : public QPair< QString, QString > struct ModuleConfig
{ {
ModuleConfig( const QString& a, const QString& b ) : QPair< QString, QString >(a, b) { } QString moduleName() const { return m_module; }
ModuleConfig() : QPair< QString, QString >( QString(), QString() ) { } QString configFile() const { return m_jobConfig; }
QString language() const { return m_language; }
QString globalConfigFile() const { return m_globalConfig; }
QString moduleName() const { return first; } QString m_module;
QString configFile() const { return second; } QString m_jobConfig;
QString m_globalConfig;
QString m_language;
} ; } ;
static ModuleConfig static ModuleConfig
@ -55,6 +60,8 @@ handle_args( QCoreApplication& a )
QStringLiteral( "Global settings document" ), "global.yaml" ); QStringLiteral( "Global settings document" ), "global.yaml" );
QCommandLineOption jobOption( QStringList() << QStringLiteral( "j" ) << QStringLiteral( "job"), QCommandLineOption jobOption( QStringList() << QStringLiteral( "j" ) << QStringLiteral( "job"),
QStringLiteral( "Job settings document" ), "job.yaml" ); QStringLiteral( "Job settings document" ), "job.yaml" );
QCommandLineOption langOption( QStringList() << QStringLiteral( "l" ) << QStringLiteral( "language" ),
QStringLiteral( "Language (global)" ), "languagecode" );
QCommandLineParser parser; QCommandLineParser parser;
parser.setApplicationDescription( "Calamares module tester" ); parser.setApplicationDescription( "Calamares module tester" );
@ -64,14 +71,12 @@ handle_args( QCoreApplication& a )
parser.addOption( debugLevelOption ); parser.addOption( debugLevelOption );
parser.addOption( globalOption ); parser.addOption( globalOption );
parser.addOption( jobOption ); parser.addOption( jobOption );
parser.addOption( langOption );
parser.addPositionalArgument( "module", "Path or name of module to run." ); parser.addPositionalArgument( "module", "Path or name of module to run." );
parser.addPositionalArgument( "config", "Path of job-config file to use.", "[config]"); parser.addPositionalArgument( "config", "Path of job-config file to use.", "[config]");
parser.process( a ); parser.process( a );
QString globalSettings( parser.value( globalOption ) );
QString jobSettings( parser.value( jobOption ) );
if ( parser.isSet( debugLevelOption ) ) if ( parser.isSet( debugLevelOption ) )
{ {
bool ok = true; bool ok = true;
@ -98,10 +103,11 @@ handle_args( QCoreApplication& a )
return ModuleConfig(); // NOTREACHED return ModuleConfig(); // NOTREACHED
} }
QString jobSettings( parser.value( jobOption ) );
if ( jobSettings.isEmpty() && ( args.size() == 2 ) ) if ( jobSettings.isEmpty() && ( args.size() == 2 ) )
jobSettings = args.at(1); jobSettings = args.at(1);
return ModuleConfig( args.first(), jobSettings ); return ModuleConfig{ args.first(), jobSettings, parser.value( globalOption ), parser.value( langOption ) };
} }
@ -173,6 +179,17 @@ main( int argc, char* argv[] )
std::unique_ptr< Calamares::Settings > settings_p( new Calamares::Settings( QString(), true ) ); std::unique_ptr< Calamares::Settings > settings_p( new Calamares::Settings( QString(), true ) );
std::unique_ptr< Calamares::JobQueue > jobqueue_p( new Calamares::JobQueue( nullptr ) ); std::unique_ptr< Calamares::JobQueue > jobqueue_p( new Calamares::JobQueue( nullptr ) );
auto gs = jobqueue_p->globalStorage();
if ( !module.globalConfigFile().isEmpty() )
gs->loadYaml( module.globalConfigFile() );
if ( !module.language().isEmpty() )
{
QVariantMap vm;
vm.insert( "LANG", module.language() );
gs->insert( "localeConf", vm );
}
cDebug() << "Calamares module-loader testing" << module.moduleName(); cDebug() << "Calamares module-loader testing" << module.moduleName();
Calamares::Module* m = load_module( module ); Calamares::Module* m = load_module( module );
if ( !m ) if ( !m )