cleanups: apply valid cleanups suggested by copilot

Add test for gid/sed/rev that shouldn't match.

diff --git a/suricata/update/main.py b/suricata/update/main.py
index 8b893f2da55b2c862ec4a7185f3eff572c2df392..f94d7c2bd534a68a23907df2436cdb992f77f7e4 100644 (file)
--- a/suricata/update/main.py
+++ b/suricata/update/main.py
@@ -1409,7 +1409,8 @@ def _main():
             else:
                 logger.info("Reload command returned: {}".format(output.decode("utf-8")))
         except Exception as err:
-            logger.error("Reload command failed: {}".format(err.output))
+            logger.error("Reload command failed: {}".format(
+                getattr(err, 'output', str(err))))
 
     logger.info("Done.")
 

diff --git a/suricata/update/matchers.py b/suricata/update/matchers.py
index 9cbf1fa70c9950a2890d8fda81ec2a854c608206..6e6515e0eab83fb3947a489d06fa8879ef803414 100644 (file)
--- a/suricata/update/matchers.py
+++ b/suricata/update/matchers.py
@@ -76,7 +76,7 @@ class IdRuleMatcher(object):
 
     def __init__(self, generatorId=None, signatureId=None, rev=None):
         self.signatureIds = []
-        if generatorId and signatureId and rev:
+        if generatorId and signatureId and rev is not None:
             self.signatureIds.append((generatorId, signatureId, rev))
         elif generatorId and signatureId:
             self.signatureIds.append((generatorId, signatureId))

diff --git a/tests/test_matchers.py b/tests/test_matchers.py
index adaec72428b32cede7f93bac2f8a58f7baa32f21..07b27fb17b92b9e52ce7abc96c6f167d74fbfa98 100644 (file)
--- a/tests/test_matchers.py
+++ b/tests/test_matchers.py
@@ -113,6 +113,7 @@ class IdRuleMatcherTestCase(unittest.TestCase):
         self.assertIsNotNone(matcher)
         self.assertEqual(1, len(matcher.signatureIds))
         self.assertEqual(matcher.signatureIds[0], (1, 234, 5))
+        self.assertNotEqual(matcher.signatureIds[0], (1, 234, 0))
 
 
 class MetadataAddTestCase(unittest.TestCase):