Merge pull request EFForg#7651 from gloomy-ghost/gloomy-ghost-chrome-rulesets

Hainish · web-flow · commit a3d7dd972db6 · 2017-01-03T08:16:43.000-08:00
Update merge-rulesets.py
diff --git a/utils/merge-rulesets.py b/utils/merge-rulesets.py
@@ -52,7 +52,7 @@ def rulesize():
   return len(open(rulesets_fn).read())
 
 def clean_up(rulefile):
-    """Remove extra whitespace and comments from a ruleset"""
+    """Remove extra whitespace, comments and tests from a ruleset"""
     comment_and_newline_pattern = re.compile(r"<!--.*?-->|\n|\r", flags=re.DOTALL)
     rulefile = comment_and_newline_pattern.sub('', rulefile)
     to_and_from_pattern = re.compile(r'\s*(from=)')
@@ -61,6 +61,7 @@ def clean_up(rulefile):
     rulefile = re.sub(r">\s*<", r"><", rulefile)
     rulefile = re.sub(r"</ruleset>\s*", r"</ruleset>\n", rulefile)
     rulefile = re.sub(r"\s*(/>|<ruleset)", r"\1", rulefile)
+    rulefile = re.sub(r"<test.+?/>", r"", rulefile)
     return rulefile
 
 library = open(rulesets_fn,"w")
