Merge pull request #5 from NikolSkvarilova/master

Fixed reporting locked mock failure to jtreg logs (Issue #3)

Author: andrlos

testcases/alternativesTests/binaries_test_paths.py

@@ -21,8 +21,6 @@ def __init__(self, binariesTest):
         self.list_of_failed_tests = []
         self.installed_binaries = {}
         self.installed_slaves = {}
-        self.failed = 0
-        self.passed = 0
 
     def remove_binaries_without_slaves(self, args=None):
         return

testcases/alternativesTests/permissions_test.py

@@ -29,8 +29,6 @@ def __init__(self):
         super().__init__()
         self.list_of_failed_tests = []
         self.invalid_file_candidates = []
-        self.failed = 0
-        self.passed = 0
 
     def _get_target_java_directory(self, name):
         """Returns a directory where jdk is installed (mostly name-version-release-arch)."""

testcases/filesTest/filesTest.py

@@ -18,8 +18,6 @@ class Default(cs.JdkConfiguration):
     def __init__(self, rpms):
         super().__init__()
         self.rpms = rpms
-        self.passed = 0
-        self.failed = 0
         self.file_list = []
 
     def _set_file_list(self):

testcases/linkTests/subdirectory_test.py

@@ -21,8 +21,6 @@ def __init__(self):
         super().__init__()
         self.list_of_failed_tests = []
         self.rpms = rc.RuntimeConfig().getRpmList()
-        self.failed = 0
-        self.passed = 0
 
     def _get_arch(self):
         """ Returns architecture in 32 bit identifier """

testcases/linkTests/symlink_test.py

@@ -53,8 +53,6 @@ def __init__(self):
         super().__init__()
         self.list_of_failed_tests = []
         self.rpms = rc.RuntimeConfig().getRpmList()
-        self.passed = 0
-        self.failed = 0
 
     # symlinks -r / have struct: typeOfSymlink: path -> points_at, split[2] = '->'
     def _symlink_parser(self, symlink_list):

testcases/manpagesTests/manpage_test.py

@@ -40,8 +40,6 @@ class ManpageTestMethods(JdkConfiguration):
     """
     def __init__(self):
         super().__init__()
-        self.passed = 0
-        self.failed = 0
         self.list_of_failed_tests = []
         self.missing_manpages = []
         self.checked_subpackages = []

testcases/nameTest/initibuild_test.py

@@ -14,8 +14,6 @@
 class InitTest(utils.core.base_xtest.BaseTest):
     def __init__(self):
         super().__init__()
-        self.failed = 0
-        self.passed = 0
 
 
     def test_java(self):

testcases/nameTest/name_test.py

@@ -31,8 +31,6 @@ class NameTest(utils.core.base_xtest.BaseTest):
     test_* method, so the output would look like: test_1 = 37, test_2 = 37*2, test3=37*3 tests in total"""
     def __init__(self):
         super().__init__()
-        self.failed = 0
-        self.passed = 0
 
     def aMatchesB(self, a, b):
             return self.csch.checkRegex(a)

testcases/nameTest/subpackages_test.py

@@ -17,8 +17,6 @@ class MainPackagePresent(JdkConfiguration):
 
     def __init__(self):
         super().__init__()
-        self.failed = 0
-        self.passed = 0
 
     def _getSubPackages(self):
         return set([""])

testcases/packageTest/emptyPackages_test.py

@@ -13,8 +13,6 @@
 class EmptyPackageTest(utils.core.base_xtest.BaseTest):
     def __init__(self):
         super().__init__()
-        self.passed = 0
-        self.failed = 0
 
     def test_checkNoPacakgeEmpty(self):
         pkgs= config.runtime_config.RuntimeConfig().getRpmList().getAllFiles()

testcases/priorityTest/postinstall_master_test.py

@@ -27,8 +27,6 @@ class BasePackages(JdkConfiguration):
 
     def __init__(self):
         super().__init__()
-        self.passed = 0
-        self.failed = 0
 
     def _get_arch(self):
         return PostinstallScriptTest.instance.getCurrentArch()

testcases/priorityTest/priority_test.py

@@ -37,8 +37,6 @@ def __init__(self, length, prefix):
         self.length = length
         self.prefix = prefix
         self.list_of_failed_tests = []
-        self.passed = 0
-        self.failed = 0
 
     def _get_priority(self, master):
         """ This method calls chroot in mock and gets priority from pre-configured methods. """

testcases/providesTests/ghost_test.py

@@ -48,8 +48,6 @@ def setCSCH(self):
 class Default(cs.JdkConfiguration):
     def __init__(self):
         super().__init__()
-        self.passed = 0
-        self. failed = 0
         self.expected_ghosts = {}
 
     def _get_hardcoded_ghosts(self, file):

testcases/providesTests/provides_test.py

@@ -21,8 +21,6 @@ def __init__(self, this):
         super().__init__()
         self.rpms = rc.RuntimeConfig().getRpmList()
         self.this=this
-        self.passed = 0
-        self.failed = 0
 
     def _get_artificial_provides(self, filename):
             output, error, res = pu.executeShell("rpm -q --provides rpms/" + filename)

testcases/scripletTests/scriplet_test.py

@@ -11,8 +11,6 @@
 class TestTest(utils.core.base_xtest.BaseTest):
     def __init__(self):
         super().__init__()
-        self.passed = 0
-        self.failed = 0
 
     # this test has no asserts, therefore it is not working properly, must be fixed, now gives 0 passes, 0 fails
     def test_allScripletsPresentedAsExpected(self):

testcases/virtualDeps/obsolete_test.py

@@ -15,8 +15,6 @@
 class Base(JdkConfiguration):
     def __init__(self):
         super().__init__()
-        self.failed = 0
-        self.passed = 0
 
 
 class ITW(Base):

utils/core/base_xtest.py

@@ -22,6 +22,10 @@ def defaultMain(argv, runDocs, runTests):
 
 
 class BaseTest(BaseTestRunner):
+    def __init__(self):
+        super().__init__()
+        self.failed = 0
+        self.passed = 0
 
     def getBuild(self):
         return config.runtime_config.RuntimeConfig().getRpmList().getBuildWithoutSrpm(self.current_arch)

utils/core/configuration_specific.py

@@ -7,6 +7,8 @@ class JdkConfiguration():
 
     def __init__(self):
         self.documenting = False
+        self.failed = 0
+        self.passed = 0
 
     def _document(self, message):
         """Documentation used to generate specification-specific lines"""

utils/mock/mock_executor.py

@@ -133,8 +133,9 @@ def _rollbackCommand(self, name):
     def _scrubLvmCommand(self):
         o, e, r = exxec.processToStringsWithResult(self.mainCommand() + ["--scrub", "all"])
         if r != 0:
-            raise utils.mock.mock_execution_exception.MockExecutionException("Build chroot is locked, please restart "
-                                                                             "the testsuite.")
+            failed = "Build chroot is locked, please restart the testsuite."
+            tu.passed_or_failed(self, False, failed)
+            raise utils.mock.mock_execution_exception.MockExecutionException(failed)
         outputControl.logging_access.LoggingAccess().log(e, la.Verbosity.MOCK)
         outputControl.logging_access.LoggingAccess().log(o, la.Verbosity.MOCK)
         outputControl.logging_access.LoggingAccess().log(str(self.listSnapshots()), la.Verbosity.MOCK)

utils/test_utils.py

@@ -10,6 +10,8 @@
 #must do otherway in case of cyclic dependencies
 import utils.mock.mock_executor as mexe
 
+from utils.core.configuration_specific import JdkConfiguration
+from utils.core.base_xtest import BaseTest
 
 def closeTestSuite(passed, failed, mtc):
     la.LoggingAccess().stdout("Arch-independet mehtods counted: " + str(mtc))
@@ -193,7 +195,8 @@ def passed_or_failed(instance, bool, iffailed, ifpassed=""):
         if ifpassed != "":
             la.LoggingAccess().log("        " + ifpassed, la.Verbosity.TEST)
     else:
-        instance.failed += 1
+        if issubclass(instance.__class__, (JdkConfiguration, BaseTest)):
+            instance.failed += 1
         la.LoggingAccess().log("        " + iffailed, la.Verbosity.TEST)
         testcase.set_view_file_stub(iffailed)
     return bool