fix filtering, improve visibility of filtered messages

Author: dothebart

release_tester/arangodb/installers/__init__.py

@@ -396,34 +396,33 @@ def __init__(
     def is_version_not_supported(self, version):
         """ check whether this edition is supported in version """
         ver = semver.VersionInfo.parse(version)
-        return (self.minimum_supported_version > ver > self.maximum_supported_version)
+        return not (self.maximum_supported_version > ver > self.minimum_supported_version)
 
     def set_kwargs(self, kwargs):
         """pick values from the commandline arguments that should override defaults"""
         self.use_auto_certs = kwargs["use_auto_certs"]
         self.cluster_nodes = kwargs["cluster_nodes"]
 
     def __repr__(self):
-        return """{0.__class__.__name__}
-enterprise: {0.enterprise}
-encryption_at_rest: {0.encryption_at_rest}
-ssl: {0.ssl}
-replication2: {0.replication2}
-testrun_name: {0.testrun_name}
-directory_suffix: {0.directory_suffix}""".format(
+        return """Runner Scenario => {0.directory_suffix}
+  enterprise: {0.enterprise}
+  encryption_at_rest: {0.encryption_at_rest}
+  ssl: {0.ssl}
+  replication2: {0.replication2}
+  testrun_name: {0.testrun_name}""".format(
             self
         )
 
 
 # pylint: disable=too-many-function-args disable=line-too-long
 EXECUTION_PLAN = [
+    RunProperties(False, False, True, False, False, False, False, False, "Community", "C", False, "3.5.0", "3.12.4"),
+    RunProperties(False, True, True, False, False, False, False, False, "CommunityEnterprise", "CE", True, "3.5.0", "3.12.4"),
     RunProperties(True, False, True, True, True, False, False, True, "Enterprise\nEnc@REST", "EE"),
     RunProperties(True, False, True, True, True, False, True, False, "Enterprise\nforced OneShard", "OS"),
     # RunProperties(True, False, True, True, True, True, False, True, "Enterprise\nEnc@REST\nreplication v.2", "EEr2", False, "3.11.999"),
     RunProperties(True, False, False, False, False, False, False, True, "Enterprise", "EP"),
     # RunProperties(True, False, False, False, False, True, False, True, "Enterprise\nreplication v.2", "EPr2", False, "3.11.999"),
-    RunProperties(False, False, True, False, False, False, False, False, "Community", "C", False, "3.5.0", "3.12.4"),
-    RunProperties(False, True, True, False, False, False, False, False, "CommunityEnterprise", "CE", True, "3.5.0", "3.12.4"),
 ]
 
 

release_tester/full_download_upgrade.py

@@ -63,15 +63,16 @@ def upgrade_package_test(
     for _props in EXECUTION_PLAN:
         if _props.directory_suffix not in editions:
             continue
-        if _props.only_zip_src and not ( kwargs["zip_package"] or kwargs["src_testing"]):
-            print("skipping " + str(_props))
-            continue
         skip = False
+        if _props.only_zip_src and not ( kwargs["zip_package"] or kwargs["src_testing"]):
+            print("Zip: skipping.")
+            skip = True
         for version in [new_version, old_version]:
             if _props.is_version_not_supported(version):
+                print(f"skipping for {version}")
                 skip = True
         if skip:
-            print(f"Skipping {str(_props)}")
+            print(f"\n** Skipping {repr(_props)}\n")
             continue
         props = deepcopy(_props)
         props.set_kwargs(kwargs)