[skip ci] remove redundant test tags

merge-requests/1/merge
ansgarz 2 years ago
parent 83f9a0e40e
commit 1384b6bbcf

@ -4,11 +4,9 @@ import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInsta
import org.domaindrivenarchitecture.provs.test.defaultTestContainer import org.domaindrivenarchitecture.provs.test.defaultTestContainer
import org.domaindrivenarchitecture.provs.test.tags.ExtensiveContainerTest import org.domaindrivenarchitecture.provs.test.tags.ExtensiveContainerTest
import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Assertions.assertTrue
import org.junit.jupiter.api.Test
internal class VSCodeKtTest { internal class VSCodeKtTest {
@Test
@ExtensiveContainerTest @ExtensiveContainerTest
fun provisionAdditionalTools() { fun provisionAdditionalTools() {
// given // given

@ -33,7 +33,6 @@ internal class ProvTest {
assertTrue(res) assertTrue(res)
} }
@Test
@ContainerTest @ContainerTest
fun sh() { fun sh() {
// given // given
@ -52,7 +51,6 @@ internal class ProvTest {
assertTrue(res) assertTrue(res)
} }
@Test
@ContainerTest @ContainerTest
@NonCi @NonCi
fun sh_with_dir_and_sudo() { fun sh_with_dir_and_sudo() {

@ -20,7 +20,6 @@ internal class UtilsKtTest {
assertEquals("test_getCallingMethodName", s) assertEquals("test_getCallingMethodName", s)
} }
@Test
@ContainerTest @ContainerTest
fun runCmdInContainer() { fun runCmdInContainer() {
// when // when

@ -8,11 +8,9 @@ import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
import org.domaindrivenarchitecture.provs.test.tags.NonCi import org.domaindrivenarchitecture.provs.test.tags.NonCi
import org.domaindrivenarchitecture.provs.test.testLocal import org.domaindrivenarchitecture.provs.test.testLocal
import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
internal class UbuntuHostDockerKtTest { internal class UbuntuHostDockerKtTest {
@Test
@NonCi @NonCi
@ContainerTest @ContainerTest
fun runAndCheckAndExitContainer() { fun runAndCheckAndExitContainer() {

@ -78,7 +78,6 @@ internal class UbuntuProvTest {
assertTrue(res2.out?.trim() == "echoed") assertTrue(res2.out?.trim() == "echoed")
} }
@Test
@ContainerTest @ContainerTest
@NonCi @NonCi
fun test_user_cannot_sudo_without_password() { fun test_user_cannot_sudo_without_password() {

@ -5,11 +5,9 @@ import org.domaindrivenarchitecture.provs.test.defaultTestContainer
import org.domaindrivenarchitecture.provs.test.tags.ContainerTest import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Assertions.assertTrue
import org.junit.jupiter.api.Test
internal class ContainerProcessorTest { internal class ContainerProcessorTest {
@Test
@ContainerTest @ContainerTest
fun cmd_works_with_echo() { fun cmd_works_with_echo() {
@ -26,7 +24,6 @@ internal class ContainerProcessorTest {
} }
@Test
@ContainerTest @ContainerTest
fun cmdNoLog_works_with_echo() { fun cmdNoLog_works_with_echo() {
// given // given

@ -4,13 +4,11 @@ import org.domaindrivenarchitecture.provs.framework.core.platforms.SHELL
import org.domaindrivenarchitecture.provs.test.tags.ContainerTest import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
import org.domaindrivenarchitecture.provs.test.testDockerWithSudo import org.domaindrivenarchitecture.provs.test.testDockerWithSudo
import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
val DEFAULT_START_MODE_TEST_CONTAINER = ContainerStartMode.USE_RUNNING_ELSE_CREATE val DEFAULT_START_MODE_TEST_CONTAINER = ContainerStartMode.USE_RUNNING_ELSE_CREATE
class ContainerUbuntuHostProcessorTest { class ContainerUbuntuHostProcessorTest {
@Test
@ContainerTest @ContainerTest
fun test_execution() { fun test_execution() {
// given // given

@ -23,7 +23,6 @@ import org.junit.jupiter.api.Assertions.assertFalse
internal class GopassKtTest { internal class GopassKtTest {
@ContainerTest @ContainerTest
@Test
fun test_configureGopass_fails_with_path_starting_with_tilde() { fun test_configureGopass_fails_with_path_starting_with_tilde() {
// when // when
val res = defaultTestContainer().task { val res = defaultTestContainer().task {

@ -218,7 +218,6 @@ internal class FilesystemKtTest {
} }
@Test
@ContainerTest @ContainerTest
fun userHome() { fun userHome() {
// given // given

@ -7,12 +7,10 @@ import org.domaindrivenarchitecture.provs.test.defaultTestContainer
import org.domaindrivenarchitecture.provs.test.tags.ContainerTest import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
import org.domaindrivenarchitecture.provs.test.tags.ExtensiveContainerTest import org.domaindrivenarchitecture.provs.test.tags.ExtensiveContainerTest
import org.junit.jupiter.api.Assertions.* import org.junit.jupiter.api.Assertions.*
import org.junit.jupiter.api.Test
internal class GitKtTest { internal class GitKtTest {
@Test
@ContainerTest @ContainerTest
fun trustGitServers(){ fun trustGitServers(){
// given // given
@ -31,7 +29,6 @@ internal class GitKtTest {
assertTrue(a.isHostKnown("gitlab.com"), "gitlab.com does not seem to be a known host") assertTrue(a.isHostKnown("gitlab.com"), "gitlab.com does not seem to be a known host")
} }
@Test
@ExtensiveContainerTest @ExtensiveContainerTest
fun gitClone() { fun gitClone() {
// given // given

@ -5,13 +5,11 @@ import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Assertions.assertTrue
import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Disabled
import org.junit.jupiter.api.Test
internal class InstallKtTest { internal class InstallKtTest {
@ContainerTest @ContainerTest
@Test
fun aptInstall_installsPackage() { fun aptInstall_installsPackage() {
// given // given
val a = defaultTestContainer() val a = defaultTestContainer()
@ -24,7 +22,6 @@ internal class InstallKtTest {
} }
@ContainerTest @ContainerTest
@Test
fun aptInstall_ignores_packages_already_installed() { fun aptInstall_ignores_packages_already_installed() {
// given // given
val a = defaultTestContainer() val a = defaultTestContainer()
@ -38,7 +35,6 @@ internal class InstallKtTest {
} }
@ContainerTest @ContainerTest
@Test
@Disabled // run manually if needed; @Disabled // run manually if needed;
// todo: replace zim by a smaller repo // todo: replace zim by a smaller repo
fun aptInstallFromPpa_installsPackage() { fun aptInstallFromPpa_installsPackage() {

@ -9,11 +9,9 @@ import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.privateGPGSnakeo
import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.publicGPGSnakeoilKey import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.publicGPGSnakeoilKey
import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Assertions.assertTrue
import org.junit.jupiter.api.Test
internal class GpgKtTest { internal class GpgKtTest {
@Test
@ContainerTest @ContainerTest
fun gpgFingerprint_returnsCorrectFingerprint() { fun gpgFingerprint_returnsCorrectFingerprint() {
// given // given
@ -29,7 +27,6 @@ internal class GpgKtTest {
} }
@Test
@ContainerTest @ContainerTest
fun configureGpgKeys() { fun configureGpgKeys() {
// given // given
@ -43,7 +40,6 @@ internal class GpgKtTest {
} }
@Test
@ContainerTest @ContainerTest
fun configureGpgKeysTrusted() { fun configureGpgKeysTrusted() {
// given // given
@ -59,7 +55,6 @@ internal class GpgKtTest {
} }
@Test
@ContainerTest @ContainerTest
fun configureGpgKeysIsIdempotent() { fun configureGpgKeysIsIdempotent() {
// given // given

@ -6,13 +6,10 @@ import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.privateSSHSnakeo
import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.publicSSHSnakeoilKey import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.publicSSHSnakeoilKey
import org.domaindrivenarchitecture.provs.test.defaultTestContainer import org.domaindrivenarchitecture.provs.test.defaultTestContainer
import org.domaindrivenarchitecture.provs.test.tags.ContainerTest import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Assertions.assertTrue
import org.junit.jupiter.api.Assertions.*
internal class SshKtTest { internal class SshKtTest {
@Test
@ContainerTest @ContainerTest
fun configureSshKeys() { fun configureSshKeys() {
// given // given

@ -1,7 +1,5 @@
package org.domaindrivenarchitecture.provs.framework.ubuntu.user package org.domaindrivenarchitecture.provs.framework.ubuntu.user
import org.domaindrivenarchitecture.provs.test.defaultTestContainer
import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDir import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDir
import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createFile import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createFile
import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.fileContent import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.fileContent
@ -11,15 +9,15 @@ import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.configureUs
import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.createUser import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.createUser
import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.userExists import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.userExists
import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.userIsInGroupSudo import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.userIsInGroupSudo
import org.domaindrivenarchitecture.provs.test.defaultTestContainer
import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
import org.domaindrivenarchitecture.provs.test.tags.ExtensiveContainerTest import org.domaindrivenarchitecture.provs.test.tags.ExtensiveContainerTest
import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Assertions.assertTrue
import org.junit.jupiter.api.Test
internal class ProvisionUserKtTest { internal class ProvisionUserKtTest {
@Test
@ExtensiveContainerTest @ExtensiveContainerTest
fun configureUser() { fun configureUser() {
// given // given
@ -39,7 +37,6 @@ internal class ProvisionUserKtTest {
assertTrue(res.success) assertTrue(res.success)
} }
@Test
@ContainerTest @ContainerTest
fun createUser() { fun createUser() {
// given // given
@ -60,7 +57,6 @@ internal class ProvisionUserKtTest {
assertEquals("newdummykey", a.fileContent("/home/$newUser/.ssh/authorized_keys", sudo = true)) assertEquals("newdummykey", a.fileContent("/home/$newUser/.ssh/authorized_keys", sudo = true))
} }
@Test
@ContainerTest @ContainerTest
fun createUserWithSudo() { fun createUserWithSudo() {
// given // given

@ -13,7 +13,6 @@ internal class UtilsKtTest {
val a = Prov.defaultInstance() val a = Prov.defaultInstance()
@ContainerTest @ContainerTest
@Test
fun printToShell_escapes_String_successfully() { fun printToShell_escapes_String_successfully() {
// when // when
val testString = "test if newline \n and apostrophe's ' \" and special chars $$%[]\\ äöüß \$variable and tabs \t are handled correctly" val testString = "test if newline \n and apostrophe's ' \" and special chars $$%[]\\ äöüß \$variable and tabs \t are handled correctly"
@ -54,7 +53,6 @@ internal class UtilsKtTest {
assertEquals(testMultiLineString(), resMl) assertEquals(testMultiLineString(), resMl)
} }
@Test
@ContainerTest @ContainerTest
fun echoCommandForText_in_ubuntu_container() { fun echoCommandForText_in_ubuntu_container() {
// given // given

@ -10,11 +10,9 @@ import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
import org.domaindrivenarchitecture.provs.test.tags.NonCi import org.domaindrivenarchitecture.provs.test.tags.NonCi
import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Assertions.assertTrue
import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Disabled
import org.junit.jupiter.api.Test
internal class K3dKtTest { internal class K3dKtTest {
@Test
@Disabled // remove line and execute manually as this test may take several minutes @Disabled // remove line and execute manually as this test may take several minutes
@ContainerTest @ContainerTest
@NonCi @NonCi

@ -11,11 +11,9 @@ import org.domaindrivenarchitecture.provs.server.domain.k3s.Node
import org.domaindrivenarchitecture.provs.test.defaultTestContainer import org.domaindrivenarchitecture.provs.test.defaultTestContainer
import org.domaindrivenarchitecture.provs.test.tags.ExtensiveContainerTest import org.domaindrivenarchitecture.provs.test.tags.ExtensiveContainerTest
import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Assertions.assertTrue
import org.junit.jupiter.api.Test
internal class NetworkKtTest { internal class NetworkKtTest {
@Test
@ExtensiveContainerTest @ExtensiveContainerTest
fun test_provisionNetwork() { fun test_provisionNetwork() {
// given // given

Loading…
Cancel
Save