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

Merge branch 'tighten-yaml-types'

Browse Source
This commit is contained in:
Adriaan de Groot 2020-03-20 21:56:12 +01:00
commit c850408555
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libcalamares/utils/Yaml.cpp
View File

@ -89,7 +89,7 @@ yamlScalarToVariant( const YAML::Node& scalarNode )
}
QVariant
QVariantList
yamlSequenceToVariant( const YAML::Node& sequenceNode )
{
QVariantList vl;
@ -101,7 +101,7 @@ yamlSequenceToVariant( const YAML::Node& sequenceNode )
}
QVariant
QVariantMap
yamlMapToVariant( const YAML::Node& mapNode )
{
QVariantMap vm;

6
src/libcalamares/utils/Yaml.h
View File

@ -22,6 +22,8 @@
#include <QStringList>
#include <QVariant>
#include <QVariantList>
#include <QVariantMap>
class QByteArray;
class QFileInfo;
@ -60,8 +62,8 @@ QVariantMap loadYaml( const QFileInfo&, bool* ok = nullptr );
QVariant yamlToVariant( const YAML::Node& node );
QVariant yamlScalarToVariant( const YAML::Node& scalarNode );
QVariant yamlSequenceToVariant( const YAML::Node& sequenceNode );
QVariant yamlMapToVariant( const YAML::Node& mapNode );
QVariantList yamlSequenceToVariant( const YAML::Node& sequenceNode );
QVariantMap yamlMapToVariant( const YAML::Node& mapNode );
/// @brief Returns all the elements of @p listNode in a StringList
QStringList yamlToStringList( const YAML::Node& listNode );

2
src/libcalamaresui/Branding.cpp
View File

@ -123,7 +123,7 @@ loadStrings( QMap< QString, QString >& map,
throw YAML::Exception( YAML::Mark(), std::string( "Branding configuration is not a map: " ) + key );
}
const auto& config = CalamaresUtils::yamlMapToVariant( doc[ key ] ).toMap();
const auto& config = CalamaresUtils::yamlMapToVariant( doc[ key ] );
map.clear();
for ( auto it = config.constBegin(); it != config.constEnd(); ++it )

2
src/libcalamaresui/modulesystem/Module.cpp
View File

@ -237,7 +237,7 @@ void Module::loadConfigurationFile( const QString& configFileName ) //throws YA
}
cDebug() << "Loaded module configuration" << path;
m_configurationMap = CalamaresUtils::yamlMapToVariant( doc ).toMap();
m_configurationMap = CalamaresUtils::yamlMapToVariant( doc );
m_emergency = m_maybe_emergency && m_configurationMap.contains( EMERGENCY )
&& m_configurationMap[ EMERGENCY ].toBool();
return;

6
src/modules/contextualprocess/Tests.cpp
View File

@ -79,14 +79,15 @@ ContextualProcessTests::testProcessListSampleConfig()
}
ContextualProcessJob job;
job.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc ).toMap() );
job.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc ) );
QCOMPARE( job.count(), 2 ); // Only "firmwareType" and "branding.shortVersion"
QCOMPARE( job.count( "firmwareType" ), 4 );
QCOMPARE( job.count( "branding.shortVersion" ), 2 ); // in the example config
}
void ContextualProcessTests::testFetch()
void
ContextualProcessTests::testFetch()
{
Logger::setupLogLevel( Logger::LOGVERBOSE );
@ -187,5 +188,4 @@ void ContextualProcessTests::testFetch()
QCOMPARE( s, QString() );
QVERIFY( s.isEmpty() );
}
}

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

@ -62,7 +62,7 @@ ShellProcessTests::testProcessListSampleConfig()
}
}
CommandList cl( CalamaresUtils::yamlMapToVariant( doc ).toMap().value( "script" ) );
CommandList cl( CalamaresUtils::yamlMapToVariant( doc ).value( "script" ) );
QVERIFY( !cl.isEmpty() );
QCOMPARE( cl.count(), 3 );
@ -79,7 +79,7 @@ script:
- "ls /nonexistent"
- "/bin/false"
)" );
CommandList cl( CalamaresUtils::yamlMapToVariant( doc ).toMap().value( "script" ) );
CommandList cl( CalamaresUtils::yamlMapToVariant( doc ).value( "script" ) );
QVERIFY( !cl.isEmpty() );
QCOMPARE( cl.count(), 3 );
@ -90,7 +90,7 @@ script:
- false
- "ls /nonexistent"
)" );
CommandList cl1( CalamaresUtils::yamlMapToVariant( doc ).toMap().value( "script" ) );
CommandList cl1( CalamaresUtils::yamlMapToVariant( doc ).value( "script" ) );
QVERIFY( !cl1.isEmpty() );
QCOMPARE( cl1.count(), 2 ); // One element ignored
}
@ -101,7 +101,7 @@ ShellProcessTests::testProcessListFromString()
YAML::Node doc = YAML::Load( R"(---
script: "ls /tmp"
)" );
CommandList cl( CalamaresUtils::yamlMapToVariant( doc ).toMap().value( "script" ) );
CommandList cl( CalamaresUtils::yamlMapToVariant( doc ).value( "script" ) );
QVERIFY( !cl.isEmpty() );
QCOMPARE( cl.count(), 1 );
@ -112,7 +112,7 @@ script: "ls /tmp"
doc = YAML::Load( R"(---
script: false
)" );
CommandList cl1( CalamaresUtils::yamlMapToVariant( doc ).toMap().value( "script" ) );
CommandList cl1( CalamaresUtils::yamlMapToVariant( doc ).value( "script" ) );
QVERIFY( cl1.isEmpty() );
QCOMPARE( cl1.count(), 0 );
}
@ -125,7 +125,7 @@ script:
command: "ls /tmp"
timeout: 20
)" );
CommandList cl( CalamaresUtils::yamlMapToVariant( doc ).toMap().value( "script" ) );
CommandList cl( CalamaresUtils::yamlMapToVariant( doc ).value( "script" ) );
QVERIFY( !cl.isEmpty() );
QCOMPARE( cl.count(), 1 );
@ -142,7 +142,7 @@ script:
timeout: 12
- "-/bin/false"
)" );
CommandList cl( CalamaresUtils::yamlMapToVariant( doc ).toMap().value( "script" ) );
CommandList cl( CalamaresUtils::yamlMapToVariant( doc ).value( "script" ) );
QVERIFY( !cl.isEmpty() );
QCOMPARE( cl.count(), 2 );
QCOMPARE( cl.at( 0 ).timeout(), 12s );
@ -157,12 +157,11 @@ ShellProcessTests::testRootSubstitution()
script:
- "ls /tmp"
)" );
QVariant plainScript = CalamaresUtils::yamlMapToVariant( doc ).toMap().value( "script" );
QVariant plainScript = CalamaresUtils::yamlMapToVariant( doc ).value( "script" );
QVariant rootScript = CalamaresUtils::yamlMapToVariant( YAML::Load( R"(---
script:
- "ls @@ROOT@@"
)" ) )
.toMap()
.value( "script" );
QVariant userScript = CalamaresUtils::yamlMapToVariant( YAML::Load( R"(---
script:
@ -170,7 +169,6 @@ script:
- "chown @@USER@@ @@ROOT@@/calatest*"
- rm -rf @@ROOT@@/calatest*
)" ) )
.toMap()
.value( "script" );
if ( !Calamares::JobQueue::instance() )