Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: sitescripts/filterhits/test/geometrical_mean_tests.py

Issue 4615801646612480: Issue 395 - Filter hits statistics backend (Closed)
Left Patch Set: Created Dec. 19, 2014, 1:16 p.m.
Right Patch Set: Addressed further comments from Sebastian. Created April 2, 2015, 10:13 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « sitescripts/filterhits/test/db_tests.py ('k') | sitescripts/filterhits/test/log_tests.py » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 # coding: utf-8 1 # coding: utf-8
2 2
3 # This file is part of the Adblock Plus web scripts, 3 # This file is part of the Adblock Plus web scripts,
4 # Copyright (C) 2006-2014 Eyeo GmbH 4 # Copyright (C) 2006-2015 Eyeo GmbH
5 # 5 #
6 # Adblock Plus is free software: you can redistribute it and/or modify 6 # Adblock Plus is free software: you can redistribute it and/or modify
7 # it under the terms of the GNU General Public License version 3 as 7 # it under the terms of the GNU General Public License version 3 as
8 # published by the Free Software Foundation. 8 # published by the Free Software Foundation.
9 # 9 #
10 # Adblock Plus is distributed in the hope that it will be useful, 10 # Adblock Plus is distributed in the hope that it will be useful,
11 # but WITHOUT ANY WARRANTY; without even the implied warranty of 11 # but WITHOUT ANY WARRANTY; without even the implied warranty of
12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 # GNU General Public License for more details. 13 # GNU General Public License for more details.
14 # 14 #
15 # You should have received a copy of the GNU General Public License 15 # You should have received a copy of the GNU General Public License
16 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 16 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
17 17
18 import unittest, MySQLdb 18 import unittest
19 from datetime import datetime 19 from datetime import datetime
20 from ConfigParser import NoOptionError
21 20
22 from sitescripts.utils import get_config 21 from sitescripts.filterhits.test import test_helpers
23 import sitescripts.filterhits.db as db 22 from sitescripts.filterhits import db, geometrical_mean
24 import sitescripts.filterhits.geometrical_mean as geometrical_mean
25 23
26 test_data = [{ 24 test_data = [{
27 "filters": { 25 "filters": {
28 "##.top-box-right-ad": { 26 "##.top-box-right-ad": {
29 "firstParty": { 27 "firstParty": {
30 "acxiom-online.com": { "hits": 6, "latest": 1414817340948 }, 28 "acxiom-online.com": { "hits": 6, "latest": 1414817340948 },
31 "google.com": { "hits": 50, "latest": 1414849084678 }, 29 "google.com": { "hits": 50, "latest": 1414849084678 },
32 "yahoo.com": { "hits": 14, "latest": 1414859271125 }, 30 "yahoo.com": { "hits": 14, "latest": 1414859271125 },
33 "doubleclick.net": { "hits": 26, "latest": 1414823430333 } 31 "doubleclick.net": { "hits": 26, "latest": 1414823430333 }
34 }, 32 },
(...skipping 27 matching lines...) Expand all
62 }, 60 },
63 "stevedeace.com##.topAddHolder": { 61 "stevedeace.com##.topAddHolder": {
64 "firstParty": { 62 "firstParty": {
65 "mathtag.com": { "hits": 14, "latest": 1415032601175 }, 63 "mathtag.com": { "hits": 14, "latest": 1415032601175 },
66 "amazonaws.com": { "hits": 18, "latest": 1414977342966 } 64 "amazonaws.com": { "hits": 18, "latest": 1414977342966 }
67 } 65 }
68 } 66 }
69 } 67 }
70 }] 68 }]
71 69
72 class GeometricalMeanTestCase(unittest.TestCase): 70 class GeometricalMeanTestCase(test_helpers.FilterhitsTestCase):
73 longMessage = True 71 longMessage = True
74 maxDiff = None 72 maxDiff = None
75 73
76 def geometrical(self, interval, new, new_timestamp, old, old_timestamp): 74 def geometrical(self, interval, new, new_timestamp, old, old_timestamp):
77 delta_divby_interval = (new_timestamp - old_timestamp) / 1000 / float(interv al) 75 delta_divby_interval = (new_timestamp - old_timestamp) / 1000 / float(interv al)
78 return long(round(old ** (1 - delta_divby_interval) * new ** delta_divby_int erval)) 76 return long(round(old ** (1 - delta_divby_interval) * new ** delta_divby_int erval))
79 77
80 def clear_rows(self):
81 if self.db:
82 db.write("DELETE FROM geometrical_mean; DELETE FROM filters;")
83
84 def setUp(self):
85 db.disconnect()
86 try:
87 self.config = get_config()
88 self.db = db.connect(
89 self.config.get("filterhitstats", "dbuser"),
90 self.config.get("filterhitstats", "dbpassword"),
91 self.config.get("filterhitstats", "test_database"))
92 except (MySQLdb.Error, NoOptionError):
93 self.db = None
94 self.clear_rows()
95
96 def tearDown(self):
97 self.clear_rows()
98 db.disconnect()
99
100 def test_calculations(self): 78 def test_calculations(self):
101 if not self.db:
102 raise unittest.SkipTest("Not connected to test DB.")
103
104 interval = 86400 79 interval = 86400
105 80
106 # Tables should be empty to start with 81 # Tables should be empty to start with
107 self.assertEqual(db.query("SELECT * FROM filters;"), ()) 82 self.assertEqual(db.query(self.db, "SELECT * FROM filters"), ())
108 self.assertEqual(db.query("SELECT * FROM geometrical_mean;"), ()) 83 self.assertEqual(db.query(self.db, "SELECT * FROM frequencies"), ())
109 # First batch 84 # First batch
110 db.write(geometrical_mean.update(interval, test_data[0])) 85 db.write(self.db, geometrical_mean.update(interval, test_data[0]))
111 self.assertEqual(db.query("SELECT * FROM filters;"), 86 self.assertEqual(db.query(self.db, "SELECT * FROM filters"),
112 (("cb4a637e0176010f51f86bb085c7b955".decode("hex"), 87 (("8c5ea548436c61f05536e205a29ada6204f603b0".decode("hex"),
113 u"##.top-box-right-ad"),)) 88 u"##.top-box-right-ad"),))
114 self.assertEqual( 89 self.assertEqual(
115 db.query("SELECT * FROM geometrical_mean;"), 90 db.query(self.db, "SELECT * FROM frequencies"),
116 (("cb4a637e0176010f51f86bb085c7b955".decode("hex"), u"acxiom-online.com", 91 (("8c5ea548436c61f05536e205a29ada6204f603b0".decode("hex"), u"acxiom-onlin e.com",
117 6L, datetime.utcfromtimestamp(1414817340948 / 1000)), 92 6L, datetime.utcfromtimestamp(1414817340948 / 1000)),
118 ("cb4a637e0176010f51f86bb085c7b955".decode("hex"), u"demdex.net", 93 ("8c5ea548436c61f05536e205a29ada6204f603b0".decode("hex"), u"demdex.net",
119 36L, datetime.utcfromtimestamp(1414838712373 / 1000)), 94 36L, datetime.utcfromtimestamp(1414838712373 / 1000)),
120 ("cb4a637e0176010f51f86bb085c7b955".decode("hex"), u"doubleclick.net", 95 ("8c5ea548436c61f05536e205a29ada6204f603b0".decode("hex"), u"doubleclick. net",
121 26L, datetime.utcfromtimestamp(1414823430333 / 1000)), 96 26L, datetime.utcfromtimestamp(1414823430333 / 1000)),
122 ("cb4a637e0176010f51f86bb085c7b955".decode("hex"), u"google.com", 97 ("8c5ea548436c61f05536e205a29ada6204f603b0".decode("hex"), u"google.com",
123 50L, datetime.utcfromtimestamp(1414849084678 / 1000)), 98 50L, datetime.utcfromtimestamp(1414849084678 / 1000)),
124 ("cb4a637e0176010f51f86bb085c7b955".decode("hex"), u"yahoo.com", 99 ("8c5ea548436c61f05536e205a29ada6204f603b0".decode("hex"), u"yahoo.com",
125 14L, datetime.utcfromtimestamp(1414859271125 / 1000)))) 100 14L, datetime.utcfromtimestamp(1414859271125 / 1000))))
126 # Second batch 101 # Second batch
127 db.write(geometrical_mean.update(interval, test_data[1])) 102 db.write(self.db, geometrical_mean.update(interval, test_data[1]))
128 self.assertEqual(db.query("SELECT * FROM filters;"), 103 self.assertEqual(db.query(self.db, "SELECT * FROM filters"),
129 (("cb4a637e0176010f51f86bb085c7b955".decode("hex"), 104 (("8c5ea548436c61f05536e205a29ada6204f603b0".decode("hex"),
130 u"##.top-box-right-ad"),)) 105 u"##.top-box-right-ad"),))
131 self.assertEqual( 106 self.assertEqual(
132 db.query("SELECT * FROM geometrical_mean;"), 107 db.query(self.db, "SELECT * FROM frequencies"),
133 (("cb4a637e0176010f51f86bb085c7b955".decode("hex"), u"acxiom-online.com", 108 (("8c5ea548436c61f05536e205a29ada6204f603b0".decode("hex"), u"acxiom-onlin e.com",
134 6L, datetime.utcfromtimestamp(1414817340948 / 1000)), 109 6L, datetime.utcfromtimestamp(1414817340948 / 1000)),
135 ("cb4a637e0176010f51f86bb085c7b955".decode("hex"), u"adsymptotic.com", 110 ("8c5ea548436c61f05536e205a29ada6204f603b0".decode("hex"), u"adsymptotic. com",
136 49L, datetime.utcfromtimestamp(1414953943015 / 1000)), 111 49L, datetime.utcfromtimestamp(1414953943015 / 1000)),
137 ("cb4a637e0176010f51f86bb085c7b955".decode("hex"), u"amazon.com", 112 ("8c5ea548436c61f05536e205a29ada6204f603b0".decode("hex"), u"amazon.com",
138 2L, datetime.utcfromtimestamp(1414913563746 / 1000)), 113 2L, datetime.utcfromtimestamp(1414913563746 / 1000)),
139 ("cb4a637e0176010f51f86bb085c7b955".decode("hex"), u"demdex.net", 114 ("8c5ea548436c61f05536e205a29ada6204f603b0".decode("hex"), u"demdex.net",
140 36L, datetime.utcfromtimestamp(1414838712373 / 1000)), 115 36L, datetime.utcfromtimestamp(1414838712373 / 1000)),
141 ("cb4a637e0176010f51f86bb085c7b955".decode("hex"), u"doubleclick.net", 116 ("8c5ea548436c61f05536e205a29ada6204f603b0".decode("hex"), u"doubleclick. net",
142 26L, datetime.utcfromtimestamp(1414823430333 / 1000)), 117 26L, datetime.utcfromtimestamp(1414823430333 / 1000)),
143 ("cb4a637e0176010f51f86bb085c7b955".decode("hex"), u"google.com", 118 ("8c5ea548436c61f05536e205a29ada6204f603b0".decode("hex"), u"google.com",
144 self.geometrical(interval, 21, 1414953920364, 50, 1414849084678), 119 self.geometrical(interval, 21, 1414953920364, 50, 1414849084678),
145 datetime.utcfromtimestamp(1414953920364 / 1000)), 120 datetime.utcfromtimestamp(1414953920364 / 1000)),
146 ("cb4a637e0176010f51f86bb085c7b955".decode("hex"), u"live.com", 121 ("8c5ea548436c61f05536e205a29ada6204f603b0".decode("hex"), u"live.com",
147 34L, datetime.utcfromtimestamp(1414916268769 / 1000)), 122 34L, datetime.utcfromtimestamp(1414916268769 / 1000)),
148 ("cb4a637e0176010f51f86bb085c7b955".decode("hex"), u"yahoo.com", 123 ("8c5ea548436c61f05536e205a29ada6204f603b0".decode("hex"), u"yahoo.com",
149 self.geometrical(interval, 27, 1414917270343, 14, 1414859271125), 124 self.geometrical(interval, 27, 1414917270343, 14, 1414859271125),
150 datetime.utcfromtimestamp(1414917270343 / 1000)))) 125 datetime.utcfromtimestamp(1414917270343 / 1000))))
151 # Third batch 126 # Third batch
152 db.write(geometrical_mean.update(interval, test_data[2])) 127 db.write(self.db, geometrical_mean.update(interval, test_data[2]))
153 self.assertEqual(db.query("SELECT * FROM filters;"), 128 self.assertEqual(db.query(self.db, "SELECT * FROM filters"),
154 (("23b2670782157a39ee4454a32155f299".decode("hex"), 129 (("22de8d2ba8429eb170a0ece6ea7a426f7b22e574".decode("hex"),
155 u"stevedeace.com##.topAddHolder"), 130 u"stevedeace.com##.topAddHolder"),
156 ("cb4a637e0176010f51f86bb085c7b955".decode("hex"), 131 ("8c5ea548436c61f05536e205a29ada6204f603b0".decode("hex"),
157 u"##.top-box-right-ad"))) 132 u"##.top-box-right-ad")))
158 self.assertEqual( 133 self.assertEqual(
159 db.query("SELECT * FROM geometrical_mean;"), 134 db.query(self.db, "SELECT * FROM frequencies"),
160 (("cb4a637e0176010f51f86bb085c7b955".decode("hex"), u"acxiom-online.com", 135 (("8c5ea548436c61f05536e205a29ada6204f603b0".decode("hex"), u"acxiom-onlin e.com",
161 6L, datetime.utcfromtimestamp(1414817340948 / 1000)), 136 6L, datetime.utcfromtimestamp(1414817340948 / 1000)),
162 ("cb4a637e0176010f51f86bb085c7b955".decode("hex"), u"adsymptotic.com", 137 ("8c5ea548436c61f05536e205a29ada6204f603b0".decode("hex"), u"adsymptotic. com",
163 self.geometrical(interval, 15, 1414994112862, 49, 1414953943015), 138 self.geometrical(interval, 15, 1414994112862, 49, 1414953943015),
164 datetime.utcfromtimestamp(1414994112862 / 1000)), 139 datetime.utcfromtimestamp(1414994112862 / 1000)),
165 ("cb4a637e0176010f51f86bb085c7b955".decode("hex"), u"amazon.com", 140 ("8c5ea548436c61f05536e205a29ada6204f603b0".decode("hex"), u"amazon.com",
166 2L, datetime.utcfromtimestamp(1414913563746 / 1000)), 141 2L, datetime.utcfromtimestamp(1414913563746 / 1000)),
167 ("23b2670782157a39ee4454a32155f299".decode("hex"), u'amazonaws.com', 142 ("22de8d2ba8429eb170a0ece6ea7a426f7b22e574".decode("hex"), u"amazonaws.co m",
168 18L, datetime.utcfromtimestamp(1414977342966 / 1000)), 143 18L, datetime.utcfromtimestamp(1414977342966 / 1000)),
169 ("cb4a637e0176010f51f86bb085c7b955".decode("hex"), u"demdex.net", 144 ("8c5ea548436c61f05536e205a29ada6204f603b0".decode("hex"), u"demdex.net",
170 36L, datetime.utcfromtimestamp(1414838712373 / 1000)), 145 36L, datetime.utcfromtimestamp(1414838712373 / 1000)),
171 ("cb4a637e0176010f51f86bb085c7b955".decode("hex"), u"doubleclick.net", 146 ("8c5ea548436c61f05536e205a29ada6204f603b0".decode("hex"), u"doubleclick. net",
172 26L, datetime.utcfromtimestamp(1414823430333 / 1000)), 147 26L, datetime.utcfromtimestamp(1414823430333 / 1000)),
173 ("cb4a637e0176010f51f86bb085c7b955".decode("hex"), u"google.com", 148 ("8c5ea548436c61f05536e205a29ada6204f603b0".decode("hex"), u"google.com",
174 self.geometrical(interval, 14, 1415008533089, 149 self.geometrical(interval, 14, 1415008533089,
175 self.geometrical(interval, 21, 1414953920364, 150 self.geometrical(interval, 21, 1414953920364,
176 50, 1414849084678), 151 50, 1414849084678),
177 1414953920364), 152 1414953920364),
178 datetime.utcfromtimestamp(1415008533089 / 1000)), 153 datetime.utcfromtimestamp(1415008533089 / 1000)),
179 ("cb4a637e0176010f51f86bb085c7b955".decode("hex"), u"live.com", 154 ("8c5ea548436c61f05536e205a29ada6204f603b0".decode("hex"), u"live.com",
180 34L, datetime.utcfromtimestamp(1414916268769 / 1000)), 155 34L, datetime.utcfromtimestamp(1414916268769 / 1000)),
181 ("23b2670782157a39ee4454a32155f299".decode("hex"), u'mathtag.com', 156 ("22de8d2ba8429eb170a0ece6ea7a426f7b22e574".decode("hex"), u"mathtag.com" ,
182 14L, datetime.utcfromtimestamp(1415032601175 / 1000)), 157 14L, datetime.utcfromtimestamp(1415032601175 / 1000)),
183 ("cb4a637e0176010f51f86bb085c7b955".decode("hex"), u"yahoo.com", 158 ("8c5ea548436c61f05536e205a29ada6204f603b0".decode("hex"), u"yahoo.com",
184 self.geometrical(interval, 43, 1415045194098, 159 self.geometrical(interval, 43, 1415045194098,
185 self.geometrical(interval, 27, 1414917270343, 160 self.geometrical(interval, 27, 1414917270343,
186 14, 1414859271125), 161 14, 1414859271125),
187 1414917270343), 162 1414917270343),
188 datetime.utcfromtimestamp(1415045194098 / 1000)))) 163 datetime.utcfromtimestamp(1415045194098 / 1000))))
189 164
190 if __name__ == '__main__': 165 if __name__ == "__main__":
191 unittest.main() 166 unittest.main()
LEFTRIGHT

Powered by Google App Engine
This is Rietveld