almalinux/lorax
14
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source 
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.

Cherry-picked from f1c15c67e0

Related: rhbz#1825190
This commit is contained in:
Alexander Todorov 2020-07-21 11:28:15 +03:00 committed by Brian C. Lane
parent 6deb09db64
commit a6aab2242a
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/check-cli
View File

@ -1,5 +1,7 @@
#!/usr/bin/python3
import unittest
import tempfile
import composertest
@ -21,13 +23,16 @@ class TestImages(composertest.ComposerTestCase):
def test_compose_sanity(self):
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):
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):
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):
def tearDown(self):
super().tearDownTestMachine()
@ -53,6 +58,7 @@ class TestQcow2(composertest.ComposerTestCase):
self.runImageTest("/tests/cli/test_boot_qcow2.sh")
@unittest.skip("Image building is now tested by osbuild-composer test suite")
class TestLiveIso(composertest.ComposerTestCase):
def tearDown(self):
super().tearDownTestMachine()
@ -74,11 +80,13 @@ class TestLiveIso(composertest.ComposerTestCase):
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):
def test_repos_sanity(self):
self.runCliTest("/tests/cli/test_repos_sanity.sh")
@unittest.skip("Image building is now tested by osbuild-composer test suite")
class TestTar(composertest.ComposerTestCase):
def test_tar(self):
self.runCliTest("/tests/cli/test_compose_tar.sh")

3
test/check-cloud
View File

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

11
test/run
View File

@ -5,18 +5,9 @@
make vm
if [ -n "$TEST_SCENARIO" ]; then
if [ "$TEST_SCENARIO" == "live-iso" ]; 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" == "ci" ]; then
if [ "$TEST_SCENARIO" == "ci" ]; then
test/check-cli TestPylint
else
test/check-cloud TestCloud.test_$TEST_SCENARIO
fi
else
test/check-cli TestImages
test/check-cli TestRepos
fi