tests: Disable non-cli test scenarios b/c osbuild-composer

the image building functionality is now tested by the
osbuild-composer test suite. We weren't successfull at making this
test suite work with the 2 backends so decided to disabled these
scenarios instead. In the future they will likely be deleted.
This commit is contained in:
Alexander Todorov 2020-07-21 11:28:15 +03:00 committed by Brian C. Lane
parent 52fd0f823b
commit f1c15c67e0
4 changed files with 16 additions and 11 deletions

View File

@ -1,9 +1,13 @@
#!/usr/bin/python3 #!/usr/bin/python3
import unittest
import composertest import composertest
import requests import requests
import subprocess import subprocess
@unittest.skip("API is now tested by osbuild-composer test suite")
class TestApi(composertest.ComposerTestCase): class TestApi(composertest.ComposerTestCase):
"""Test Composer HTTP API""" """Test Composer HTTP API"""

View File

@ -1,5 +1,7 @@
#!/usr/bin/python3 #!/usr/bin/python3
import unittest
import tempfile import tempfile
import composertest import composertest
@ -20,13 +22,16 @@ class TestImages(composertest.ComposerTestCase):
def test_compose_sanity(self): def test_compose_sanity(self):
self.runCliTest("/tests/cli/test_compose_sanity.sh") self.runCliTest("/tests/cli/test_compose_sanity.sh")
@unittest.skip("Image building is now tested by osbuild-composer test suite")
def test_ext4_filesystem(self): def test_ext4_filesystem(self):
self.runCliTest("/tests/cli/test_compose_ext4-filesystem.sh") self.runCliTest("/tests/cli/test_compose_ext4-filesystem.sh")
@unittest.skip("Image building is now tested by osbuild-composer test suite")
def test_partitioned_disk(self): def test_partitioned_disk(self):
self.runCliTest("/tests/cli/test_compose_partitioned-disk.sh") self.runCliTest("/tests/cli/test_compose_partitioned-disk.sh")
@unittest.skip("Image building is now tested by osbuild-composer test suite")
class TestQcow2(composertest.ComposerTestCase): class TestQcow2(composertest.ComposerTestCase):
def tearDown(self): def tearDown(self):
super().tearDownTestMachine() super().tearDownTestMachine()
@ -52,6 +57,7 @@ class TestQcow2(composertest.ComposerTestCase):
self.runImageTest("/tests/cli/test_boot_qcow2.sh") self.runImageTest("/tests/cli/test_boot_qcow2.sh")
@unittest.skip("Image building is now tested by osbuild-composer test suite")
class TestLiveIso(composertest.ComposerTestCase): class TestLiveIso(composertest.ComposerTestCase):
def tearDown(self): def tearDown(self):
super().tearDownTestMachine() super().tearDownTestMachine()
@ -73,11 +79,13 @@ class TestLiveIso(composertest.ComposerTestCase):
self.runImageTest("/tests/cli/test_boot_live-iso.sh") self.runImageTest("/tests/cli/test_boot_live-iso.sh")
@unittest.skip("Image building is now tested by osbuild-composer test suite")
class TestRepos(composertest.ComposerTestCase): class TestRepos(composertest.ComposerTestCase):
def test_repos_sanity(self): def test_repos_sanity(self):
self.runCliTest("/tests/cli/test_repos_sanity.sh") self.runCliTest("/tests/cli/test_repos_sanity.sh")
@unittest.skip("Image building is now tested by osbuild-composer test suite")
class TestTar(composertest.ComposerTestCase): class TestTar(composertest.ComposerTestCase):
def test_tar(self): def test_tar(self):
self.runCliTest("/tests/cli/test_compose_tar.sh") self.runCliTest("/tests/cli/test_compose_tar.sh")

View File

@ -1,8 +1,11 @@
#!/usr/bin/python3 #!/usr/bin/python3
import unittest
import composertest import composertest
@unittest.skip("Image building is now tested by osbuild-composer test suite")
class TestCloud(composertest.ComposerTestCase): class TestCloud(composertest.ComposerTestCase):
def test_alibaba(self): def test_alibaba(self):
self.runCliTest("/tests/cli/test_compose_alibaba.sh") self.runCliTest("/tests/cli/test_compose_alibaba.sh")

View File

@ -5,19 +5,9 @@
make vm make vm
if [ -n "$TEST_SCENARIO" ]; then if [ -n "$TEST_SCENARIO" ]; then
if [ "$TEST_SCENARIO" == "live-iso" ]; then if [ "$TEST_SCENARIO" == "lorax" ]; then
test/check-cli TestLiveIso
elif [ "$TEST_SCENARIO" == "qcow2" ]; then
test/check-cli TestQcow2
elif [ "$TEST_SCENARIO" == "tar" ]; then
test/check-cli TestTar
elif [ "$TEST_SCENARIO" == "lorax" ]; then
test/check-lorax TestLorax test/check-lorax TestLorax
else
test/check-cloud TestCloud.test_$TEST_SCENARIO
fi fi
else else
test/check-cli TestImages test/check-cli TestImages
test/check-api
test/check-cli TestRepos
fi fi