From e35caca49a22c0f2507d794bee0e3cddd3601ea0 Mon Sep 17 00:00:00 2001 From: az Date: Sun, 26 Mar 2023 19:49:16 +0200 Subject: [PATCH] [skip ci] disable very long running tests for desktop setup and remove 1 test --- .../desktop/domain/DesktopServiceKtTest.kt | 24 +------------------ .../resources/desktop-config-example.json | 6 ----- 2 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 src/test/resources/desktop-config-example.json diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopServiceKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopServiceKtTest.kt index 4924fd2..5e7878f 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopServiceKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopServiceKtTest.kt @@ -1,6 +1,5 @@ package org.domaindrivenarchitecture.provs.desktop.domain -import org.domaindrivenarchitecture.provs.desktop.infrastructure.getConfig import org.domaindrivenarchitecture.provs.framework.core.ProgressType import org.domaindrivenarchitecture.provs.framework.core.Prov import org.domaindrivenarchitecture.provs.framework.core.docker.provideContainer @@ -46,6 +45,7 @@ internal class DesktopServiceKtTest { } @ExtensiveContainerTest + @Disabled("Takes very long, enable if you want to test a desktop setup") fun provisionDesktop() { // given val prov = defaultTestContainer() @@ -87,28 +87,6 @@ internal class DesktopServiceKtTest { // then assertTrue(res.success) } - - - @ExtensiveContainerTest - fun provisionDesktopFromConfigFile() { - // given - val prov = defaultTestContainer() - - // when - // in order to test DesktopType.OFFICE: fix installing libreoffice for a fresh container as it hangs the first time but succeeds 2nd time - val config = getConfig("src/test/resources/desktop-config-example.json") - val res = prov.provisionDesktop( - DesktopType.BASIC, - config.ssh?.keyPair(), - config.gpg?.keyPair(), - config.gitUserName, - config.gitEmail, - onlyModules = null - ) - - // then - assertTrue(res.success) - } } diff --git a/src/test/resources/desktop-config-example.json b/src/test/resources/desktop-config-example.json deleted file mode 100644 index 1ac697b..0000000 --- a/src/test/resources/desktop-config-example.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "ssh": null, - "gpg": null, - "gitUserName": "mygitusername", - "gitEmail": "my@git.email" -} \ No newline at end of file