Merge pull request #313 from oliverkurth/topic/okurth/test-conflicts

improve conflict tests
vmware · May 6, 2022 · 0bf7031 · 0bf7031
2 parents ccf0d72 + 12116bc
commit 0bf7031
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/pytests/tests/test_conflict.py b/pytests/tests/test_conflict.py
@@ -12,7 +12,7 @@
 pkg1 = "tdnf-conflict-file1"
 
 
-@pytest.fixture(scope='module', autouse=True)
+@pytest.fixture(scope='function', autouse=True)
 def setup_test(utils):
     yield
     teardown_test(utils)
@@ -31,9 +31,12 @@ def test_install_conflict_file(utils):
     ret = utils.run(['tdnf', 'install', '-y', '--nogpgcheck', pkg1])
     print(ret)
     assert(ret['retval'] == 1525)
+    assert(not utils.check_package(pkg1))
 
 
 def test_install_conflict_file_atonce(utils):
     ret = utils.run(['tdnf', 'install', '-y', '--nogpgcheck', pkg0, pkg1])
     print(ret)
     assert(ret['retval'] == 1525)
+    assert(not utils.check_package(pkg0))
+    assert(not utils.check_package(pkg1))
diff --git a/pytests/tests/test_skip_md.py b/pytests/tests/test_skip_md.py
@@ -93,6 +93,7 @@ def test_install_conflict_file(utils):
     ret = utils.run(['tdnf', '--repoid={}'.format(REPOID), 'install', '-y', '--nogpgcheck', pkg1])
     print(ret)
     assert(ret['retval'] == 1525)
+    assert(not utils.check_package(pkg1))
 
 
 def test_install_conflict_file_atonce(utils):
@@ -102,3 +103,5 @@ def test_install_conflict_file_atonce(utils):
     ret = utils.run(['tdnf', '--repoid={}'.format(REPOID), 'install', '-y', '--nogpgcheck', pkg0, pkg1])
     print(ret)
     assert(ret['retval'] == 1525)
+    assert(not utils.check_package(pkg0))
+    assert(not utils.check_package(pkg1))