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

[users] Fix tests

Browse Source 
- in 3.3, the legacy values are ignored, so all the old-style
  tests behave as if nothing is set at all.
- Some tests used old-style settings, adapt to newer ones.
This commit is contained in:
Adriaan de Groot 2022-05-09 15:13:42 +02:00
parent f4e9b3689d
commit 824d706a20
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -279,8 +279,10 @@ UserTests::testHostActions2()
QCOMPARE( c.hostnameAction(), HostNameAction::EtcHostname );
QCOMPARE( c.writeEtcHosts(), true );
legacy.insert( "writeHostsFile", false );
legacy.insert( "setHostname", "Hostnamed" );
QVariantMap hostSettings;
hostSettings.insert( "writeHostsFile", false );
hostSettings.insert( "location", "Hostnamed" );
legacy.insert( "hostname", hostSettings );
c.setConfigurationMap( legacy );
QCOMPARE( c.hostnameAction(), HostNameAction::SystemdHostname );
QCOMPARE( c.writeEtcHosts(), false );
@ -464,16 +466,14 @@ UserTests::testUserYAML_data()
QTest::addColumn< QString >( "filename" );
QTest::addColumn< QString >( "shell" );
QTest::newRow( "old, unset " ) << "tests/7ao-shell.conf"
<< "/bin/bash";
QTest::newRow( "old, empty " ) << "tests/7bo-shell.conf"
<< "";
QTest::newRow( "old, relative" ) << "tests/7co-shell.conf"
<< "/bin/ls"; // Setting is ignored
QTest::newRow( "old, invalid " ) << "tests/7do-shell.conf"
<< "";
QTest::newRow( "old, absolute" ) << "tests/7eo-shell.conf"
<< "/usr/bin/dash";
const QString bash = QStringLiteral( "/bin/bash" );
// All the old settings are ignored
QTest::newRow( "old, unset " ) << "tests/7ao-shell.conf" << bash;
QTest::newRow( "old, empty " ) << "tests/7bo-shell.conf" << bash;
QTest::newRow( "old, relative" ) << "tests/7co-shell.conf" << bash;
QTest::newRow( "old, invalid " ) << "tests/7do-shell.conf" << bash;
QTest::newRow( "old, absolute" ) << "tests/7eo-shell.conf" << bash;
QTest::newRow( "new, unset " ) << "tests/7an-shell.conf"
<< "/bin/bash";