Issue 1390 - Record referrer for download stats

sitescripts/stats/test/logprocessor.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2014 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
@@ skipping 594 matching lines @@
           "platform": "chromium",
           "platformVersion": "28.0",
           "fullPlatform": "chromium 28.0",
           "downloadInterval": "1 day(s)",
           "previousDownload": "2 day(s)",
           "firstInDay": True,
         }
       ),
     ]
     for line, expected_record in tests:
-      result = logprocessor.parse_record(line, set(), FakeGeo(), FakeGeo())
-      # assertEqual() treats identical Unicode and non-Unicode strings as
-      # different, make sure that all our strings are non-Unicode.

[Sebastian Noack, 2014/09/18 15:50:04]

Why don't you just use unicode literals above?

[Wladimir Palant, 2014/09/18 18:42:50]

Because I don't know which one will use Unicode - it seems pretty random. I
don't know why parse_query returns Unicode for some parameters and not others,
but I'm pretty sure that this test passed before.

[Sebastian Noack, 2014/09/19 09:48:42]

According to my tests it doesn't. All strings in the result are plain strings
and all tests pass for me without this hack.

[Wladimir Palant, 2014/09/22 10:39:05]

For some reason I cannot reproduce it any longer, so I removed that hack. If
that issue ever comes back we can still revisit it.

-      if result:
-        for key, value in result.iteritems():
-          if isinstance(value, unicode):
-            result[key] = str(value)
-      self.assertEqual(result, expected_record, "Parsing log line '%s'" % line)
+      self.assertEqual(logprocessor.parse_record(line, set(), FakeGeo(), FakeGeo()), expected_record, "Parsing log line '%s'" % line)
 
   def test_record_adding(self):
     tests = [
       (
         {"size": 200},
         {},
         (),
         {"hits": 1, "bandwidth": 200},
       ),
       (
@@ skipping 40 matching lines @@
           "addonName": {"bar": {"hits": 1, "bandwidth": 200}}
         },
       ),
     ]
     for info, section, ignored_fields, expected_result in tests:
       logprocessor.add_record(info, section, ignored_fields)
       self.assertEqual(section, expected_result)
 
 if __name__ == '__main__':
   unittest.main()