Add Test for duplicated test URLs, Fix EFForg#14659 (EFForg#14660)

Chan Chak Shing · Hainish · commit 92a923270b94 · 2018-04-16T21:10:50.000-07:00
diff --git a/test/rules/src/https_everywhere_checker/rules.py b/test/rules/src/https_everywhere_checker/rules.py
@@ -80,6 +80,11 @@ def __init__(self, url):
         """
         self.url = url
 
+    def __eq__(test1, test2):
+        return test1.url == test2.url
+
+    def __hash__(self):
+        return self.url.__hash__()
 
 class Ruleset(object):
     """Represents one XML ruleset file."""
@@ -176,6 +181,14 @@ def _determineTestApplication(self):
                  off that rule or exclusion.  Return any coverage problems."""
         if not self.determine_test_application_run:
             self.test_application_problems = []
+
+            # check for duplicated test urls
+            if len(self.tests) != len(set(self.tests)):
+                for test in set(self.tests):
+                    if self.tests.count(test) > 1:
+                        self.test_application_problems.append("%s: Duplicated test URL found %s" % (
+                            self.filename, test.url))
+
             for test in self.tests:
                 applies = self.whatApplies(test.url)
                 if applies:
diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-whitelist.csv
@@ -1,4 +1,5 @@
 hash,auto-pass coverage test,auto-pass fetch test,filename
+5785b7928af742599dbf3692f62c264e402cab98cca3700d411fb2f2993c03b3,1,0,Samsung.xml
 fbb2d56d33f886b53c314eac3446eed8bad7916660ad0709367936fe8335d987,0,1,112_Cafe.com.xml
 43a7a917b89600c8dd3495359879ad1dfe468d9a478e63d5bbc6430a31cc41c2,1,1,123-reg.xml
 5b650e2b6084539440a1b66b5b45f5825a2d61db7812c7521e1a1e0860c4b6a3,1,1,16163.com.xml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`hash,auto-pass coverage test,auto-pass fetch test,filename`
	`2`	`+5785b7928af742599dbf3692f62c264e402cab98cca3700d411fb2f2993c03b3,1,0,Samsung.xml`
`2`	`3`	`fbb2d56d33f886b53c314eac3446eed8bad7916660ad0709367936fe8335d987,0,1,112_Cafe.com.xml`
`3`	`4`	`43a7a917b89600c8dd3495359879ad1dfe468d9a478e63d5bbc6430a31cc41c2,1,1,123-reg.xml`
`4`	`5`	`5b650e2b6084539440a1b66b5b45f5825a2d61db7812c7521e1a1e0860c4b6a3,1,1,16163.com.xml`