diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2020-09-02 10:24:36 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2020-09-09 09:25:13 +0300 |
| commit | d23abd3b1e408dcbeba8fd17e15743b2b47ebaa0 (patch) | |
| tree | 505147cb9d6f7586fc09fe2ff6fc8f0be3ff02e7 /tests | |
| parent | 55ccc6bb9a90104f00dcbee99f1bb08da310d793 (diff) | |
Obey --no-default-installations when default set from script
Task-number: QTIFW-1930
Change-Id: Ie180777a0c5dc7c6a7b4e273169e673cd5c7e918
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Diffstat (limited to 'tests')
3 files changed, 11 insertions, 1 deletions
diff --git a/tests/auto/installer/cliinterface/data/installPackagesRepository/Updates.xml b/tests/auto/installer/cliinterface/data/installPackagesRepository/Updates.xml index 736eb739a..e61b11189 100644 --- a/tests/auto/installer/cliinterface/data/installPackagesRepository/Updates.xml +++ b/tests/auto/installer/cliinterface/data/installPackagesRepository/Updates.xml @@ -141,7 +141,6 @@ <Name>componentG</Name> <DisplayName>Component G (default, depends on A, dependency added dynamically)</DisplayName> <Description>By default, this component is selected for installation. It depends on component A. Dependency is added from inside component script.</Description> - <Default>true</Default> <Version>1.0.0</Version> <ReleaseDate>2014-08-25</ReleaseDate> <Script>installscript.js</Script> diff --git a/tests/auto/installer/cliinterface/data/installPackagesRepository/componentG/1.0.0meta.7z b/tests/auto/installer/cliinterface/data/installPackagesRepository/componentG/1.0.0meta.7z Binary files differindex e5c446f64..90bfe33a2 100644 --- a/tests/auto/installer/cliinterface/data/installPackagesRepository/componentG/1.0.0meta.7z +++ b/tests/auto/installer/cliinterface/data/installPackagesRepository/componentG/1.0.0meta.7z diff --git a/tests/auto/installer/cliinterface/tst_cliinterface.cpp b/tests/auto/installer/cliinterface/tst_cliinterface.cpp index 364d9ae9d..bdf57541f 100644 --- a/tests/auto/installer/cliinterface/tst_cliinterface.cpp +++ b/tests/auto/installer/cliinterface/tst_cliinterface.cpp @@ -159,6 +159,17 @@ private slots: QVERIFY(dir.removeRecursively()); } + void testNoDefaultInstallations() + { + PackageManagerCore *core = PackageManager::getPackageManagerWithInit + (m_installDir, ":///data/installPackagesRepository"); + core->setNoDefaultInstallation(true); + core->installDefaultComponentsSilently(); + VerifyInstaller::verifyFileExistence(m_installDir, QStringList() << "components.xml" + << "installcontentE.txt"); + core->setNoDefaultInstallation(false); + } + void testInstallForcedPackageSilently() { PackageManagerCore *core = PackageManager::getPackageManagerWithInit |