From 8b00a03423b2c5fb6290e4aa7fefb5088d14d3e7 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 16 May 2018 11:36:59 -0400 Subject: [PATCH] [shellprocess] Test command-substitution --- src/modules/shellprocess/Tests.cpp | 13 +++++++++++++ src/modules/shellprocess/Tests.h | 2 ++ 2 files changed, 15 insertions(+) diff --git a/src/modules/shellprocess/Tests.cpp b/src/modules/shellprocess/Tests.cpp index c6643325f..ebfb8046b 100644 --- a/src/modules/shellprocess/Tests.cpp +++ b/src/modules/shellprocess/Tests.cpp @@ -149,3 +149,16 @@ script: QCOMPARE( cl.at(0).command(), QStringLiteral( "ls /tmp" ) ); QCOMPARE( cl.at(1).timeout(), -1 ); // not set } + +void ShellProcessTests::testRootSubstitution() +{ + YAML::Node doc = YAML::Load( R"(--- +script: + - "ls /tmp" +)" ); + QVariant script = CalamaresUtils::yamlMapToVariant( doc ).toMap().value( "script" ); + + // Doesn't use @@ROOT@@, so no failures + QVERIFY( bool(CommandList(script, true, 10 ).run()) ); + QVERIFY( bool(CommandList(script, false, 10 ).run()) ); +} diff --git a/src/modules/shellprocess/Tests.h b/src/modules/shellprocess/Tests.h index af1f78487..5b4ebebbb 100644 --- a/src/modules/shellprocess/Tests.h +++ b/src/modules/shellprocess/Tests.h @@ -40,6 +40,8 @@ private Q_SLOTS: void testProcessFromObject(); // Create from a complex YAML list void testProcessListFromObject(); + // Check @@ROOT@@ substitution + void testRootSubstitution(); }; #endif