Issue 6602 - Introduce watchextensions

tests/test_ExtWatch.py

 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import io
 import os
 import pytest
 import shutil
 import subprocess
 from zipfile import ZipFile
 try:  # Python 3+
     from unittest import mock
 except ImportError:  # Python 2.7
     import mock
 
-from watchextensions import ConfigurationError, ExtWatcher, read_config, urllib
+from watchextensions import (OMAHA_URL, ConfigurationError, ExtWatcher,
+                             read_config)
 
 
 @pytest.fixture
 def remote_local(tmpdir):
     remote = tmpdir.mkdir('remote')
     subprocess.check_output(['git', 'init', '--bare'], cwd=str(remote))
 
     local = tmpdir.mkdir('repository')
     subprocess.check_output(['git', 'clone', str(remote), str(local)])
 
@@ skipping 36 matching lines @@
 @pytest.fixture
 def crx(tmpdir):
     v2_path = str(tmpdir.join('v2.crx'))
 
     with ZipFile(v2_path, 'w') as fp:
         fp.writestr('a.txt', 'foo\nbaz')
 
     return str(v2_path)
 
 
-orig_urlopen = urllib.urlopen
-
-
 def mock_urlopen(*args, **kwargs):
     mocked_xml = ('<gupdate xmlns="http://www.google.com/update2/response" '
                   'protocol="2.0" server="prod"><app appid="abc" cohort="" '
                   'cohortname="" status="ok"><updatecheck version="0.2"/>'
                   '</app></gupdate>').encode()
-    if 'https://omahaproxy.appspot.com/all.json?os=win' in args:
-        return orig_urlopen(*args)

[Vasily Kuznetsov, 2018/05/15 16:49:31]

This makes the test hit that API every time it's run and makes it dependent on
the internet in general. It would be better to mock it, unless it's too much
work.

[tlucas, 2018/05/16 09:52:37]

No, you are right. I'm also mocking this now.

+    if OMAHA_URL in args:
+        fp = io.open(os.path.join(os.path.dirname(__file__),
+                                  'data',
+                                  'omaha.json'),
+                     'rt')
+        mocked = fp.read().encode()
+        fp.close()
+    else:
+        mocked = mocked_xml
+
     buf = io.BytesIO()
-    buf.write(mocked_xml)
+    buf.write(mocked)
     buf.seek(0)
     return buf
 
 
 def test_download_push_and_diff(crx, test_config, tmpdir, remote_local):
     def mock_urlretrieve(url, filename, *args, **kwargs):
         shutil.copyfile(crx, filename)
         return None
 
     config = read_config(test_config)
@@ skipping 19 matching lines @@
                      (no_option, '"a" is not fully configured!'),
                      (empty_option, '"a" is not fully configured!')]:
 
         config = read_config(cfg)
         with ExtWatcher('a', config, False, False) as watcher:
             watcher.run()
 
         records = caplog.get_records('call')
 
         assert msg in records[-1].message