Merge pull request #5 from peterhudec/better-tests

Better tests

.travis.yml

@@ -1,5 +1,7 @@
-language: python
-install:
-  - pip install tox
+sudo: required
+services:
+  - docker
+before_install:
+  - docker build -t chromedriver-installer .
 script:
-  - tox
+  - docker run -t chromedriver-installer

Dockerfile

@@ -0,0 +1,14 @@
+FROM library/python
+
+WORKDIR /home/chromedriver_installer
+
+ADD . /home/chromedriver_installer
+
+# Chromedriver 2.29 complains on Ubuntu about
+# missing libnss3 and libgconf-2-4 libraries.
+RUN apt-get -yqq update
+RUN apt-get -yqq install libnss3 libgconf-2-4
+
+RUN pip install -q -r requirements.txt
+
+CMD tox

tests.py

@@ -1,7 +1,15 @@
+import itertools
 import os
+import re
 import shlex
 import subprocess
 import tempfile
+try:
+    # For Python 3.0 and later
+    from urllib.request import urlopen
+except ImportError:
+    # Fall back to Python 2's urllib2
+    from urllib2 import urlopen
 
 import pytest
 
@@ -11,141 +19,58 @@
 INSTALL_COMMAND_BASE = 'pip install {0} '.format(PROJECT_DIR)
 
 
-# The --version option is available since version 2.10
-VERSIONS = {
-    '2.10': (
-        '4fecc99b066cb1a346035bf022607104',
-        '058cd8b7b4b9688507701b5e648fd821',
-        'fd0dafc3ada3619edda2961f2beadc5c',
-        '082e91e5c8994a7879710caeed62e334'
-    ),
-    '2.11': (
-        'bf0d731cd34fd07e22f4641c9aec8483',
-        '7a7336caea140f6ac1cb8fae8df50d36',
-        '447ebc91ac355fc11e960c95f2c15622',
-        '44443738344b887ff1fe94710a8d45dc'
-    ),
-    '2.12': (
-        '6f4041e7f8300380cc2a13babbac354e',
-        'f306b93ff1b34af74371cee87d6560e4',
-        '259bb87f4ebf3b0bc4792ed203bd69f5',
-        '51eb47ad5ea91422aa1aaa400a724e7b'
-    ),
-    '2.13': (
-        '187dbe7973c82e59446d5bca7ed40acd',
-        'fcfd993330704f8cfb307a2fca5a9687',
-        'e37a65a1be68523385761d29decf15d4',
-        'ae85407694d3849450a25431f9669a81'
-    ),
-    '2.14': (
-        'f130cb3b94a8fbd28212f18c929f79ee',
-        '8368d266bd832ff2ea292baedbc770be',
-        '2b8a3e7249c80dec95264cbb55c897ed',
-        '00c70587c3e215f030307d546b315323'
-    ),
-    '2.15': (
-        '844c200a4d8e79ad68d76ed68f67aadd',
-        '21c22803a1fd903ba15ea21ee81de317',
-        '3842a1ed3edc23997ca78bc980310024',
-        'c75b03bf76ab53d185fc18fc89ca1af9',
-    ),
-    '2.16': (
-        'fffdb4c098adc2ab61b0e0f5b694f27e',
-        'fa8e1bc6f9ce474582876653604d675e',
-        '3ae88facdc6ad1b716820cc5f678a6c4',
-        '3e1b4a91e12a9872a4ed83c9e61c122e',
-    ),
-    '2.17': (
-        '569364de37c2743597cd6b8bb333d21a',
-        'aa2b200f118f8eaa7ed1d6bd7ca49005',
-        'bfa2d4c80e701980b5fd656e85329806',
-    ),
-    '2.18': (
-        '0ac230f5f19c72cebf3042970217ad01',
-        '709e2dd132ac6c2a09de084fdc19db45',
-        '6839b10023a48d87c4835481b9fad7a7',
-        '4bdfb306e2bce6bf42e663617578ca24'
-    ),
-    '2.19': (
-        'b1e881182574cd2354c00c384d0949cc',
-        '9e476aa088baab9bed9c1a5e7007c9c3',
-        '425ed409f989f4ca9eb1f2a745039b59',
-        '4bc98ef466ef49e45fbee95a003e01b8'
-    ),
-    '2.20': (
-        '1e8cbdb84c5b70f86030297c4be3a5f9',
-        '245858cc984bd946df6a1e6719c8e6f5',
-        '749d4be0a317e92fd3aecaa022385439',
-        '028ee452b8e23890ec5ec6b0717fd295'
-    ),
-    '2.21': (
-        'd0a589f70e53774db95bf6f46972837c',
-        '06e57f4c411e1135c6277d17ea8390fd',
-        '452d8c9cba353ba366d15fbeba013943',
-        '8a93dc3ff02ef9bc3161dd4b20f87215'
-    ),
-    '2.22': (
-        'c498db13c92abf0d504c784d2191e9b1',
-        '2a5e6ccbceb9f498788dc257334dfaa3',
-        'eed98b5a2895b9cd2432fa52f7091a71',
-        'c5962f884bd58987b1ef0fa04c6a3ce5'
-    ),
-    '2.23': (
-        '45df7fb52f4cba39a5bdcdaf2c16e171',
-        'cc89692d75fb0bdfe700ec0ca19808a5',
-        '92fa9afe62c75557bc08af3fe3450b2b',
-        '6856adb07cc8683d2a1587c05f37f1be'
-    ),
-    '2.24': (
-        '8e6b6d358f1b919a0d1369f90d61e1a4',
-        'c56e41bdc769ad2c31225b8495fc1a93',
-        'd117b66fac514344eaf80691ae9a4687',
-        '1a46c83926f891d502427df10b4646b9'
-    ),
-    '2.25': (
-        '175ac6d5a9d7579b612809434020fd3c',
-        '16673c4a4262d0f4c01836b5b3b2b110',
-        '384031f9bb782edce149c0bea89921b6',
-        '2727729883ac960c2edd63558f08f601'
-    ),
-    '2.26': (
-        'b89d58dbd6182b3d30653a28eb304850',
-        '3cdae483af1e54c6732abc9af875b9c1',
-        'd5ef788e1a5b4bfdb22836a45078f0c1',
-        '05b5f443cb1f363b81a9ac7618e862bd'
-    ),
-    '2.27': (
-        '980387b5885be8f69343ba9f11cc7a9f',
-        'c6d21c8fecf8bd0b880b2c36692153ef',
-        '56d908397af997f04fab32c05a26b994',
-        '2125188a206e2258364c3e46f07724e5'
-    ),
-    '2.28': (
-        '82e4c112862be0e7e06e5ddcbe8b077c',
-        'a72088c0a6b018ded2c0fff616da8f65',
-        '7261a8a4d45f63e6c6f5b712e089cbc3',
-        'daef8743d113cecc3bfe0c65c3423565'
-    ),
-}
-
-
-@pytest.fixture(params=VERSIONS)
-def version_info(request):
+def generate_version_fixture_params():
+    """
+    Loads all known versions of chromedriver from
+    `https://chromedriver.storage.googleapis.com`__
+    and returns a dictionary with keys ``params`` and ``ids`` which should be
+    unpacked as arguments to :func:`pytest.fixture` decorator.
+
+    This way we can generate and ``params`` and ``ids`` arguments with a single
+    function call. We need the ``ids`` parameter for nice display of tested
+    versions in the verbose ``pytest`` output.
+
+    :returns:
+        A dictionary with keys ``params`` and ``ids``.
+    """
+    body = urlopen('https://chromedriver.storage.googleapis.com').read()
+    versions = re.findall(
+        r'<Key>(\d+\.\d{2}).*?<ETag>"(.*?)"</ETag>',
+        body.decode('utf-8'),
+    )
+
+    params = [
+        (version, [checksum for _, checksum in checksums])
+        for version, checksums in itertools.groupby(versions, lambda x: x[0])
+    ]
+
+    return dict(
+        params=params,
+        ids=[version for version, _ in params]
+    )
+
+
+@pytest.fixture(**generate_version_fixture_params())
+def version(request):
+    request.param_index = request.param[0]
     return request.param
 
 
 class Base(object):
     def _uninstall(self):
         try:
-            subprocess.check_call(shlex.split('pip uninstall chromedriver_installer -y'))
+            subprocess.check_call(
+                shlex.split('pip uninstall chromedriver_installer -y')
+            )
         except subprocess.CalledProcessError:
             pass
 
         chromedriver_executable = os.path.join(VIRTUALENV_DIR,
                                                'bin', 'chromedriver')
 
         if os.path.exists(chromedriver_executable):
-            print('REMOVING chromedriver executable: ' + chromedriver_executable)
+            print('REMOVING chromedriver executable: ' +
+                  chromedriver_executable)
             os.remove(chromedriver_executable)
 
     def teardown(self):
@@ -156,28 +81,6 @@ def _not_available(self):
             subprocess.check_call(shlex.split('chromedriver --version'))
 
 
-class TestNewest(Base):
-    def test_newest(self):
-        subprocess.check_call(shlex.split(INSTALL_COMMAND_BASE))
-        # subprocess.check_call(shlex.split('chromedriver --version'))
-
-        version_info = subprocess.Popen(
-            shlex.split('chromedriver --version'),
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-        ).communicate()[0]
-
-        latest_version = max(VERSIONS.keys())
-
-        assert latest_version in version_info, (
-            'There seems to be a new version of chromedriver installer '
-            'than {0}.\nDetected: "{1}"\n'
-            'You need to add this version to the tests.VERSIONS dictionary to '
-            'make this test pass.'
-            .format(latest_version, version_info.strip())
-        )
-
-
 class TestFailure(Base):
     def test_bad_checksum(self):
         self._not_available()
@@ -198,7 +101,6 @@ def test_bad_checksum(self):
 
 
 class VersionBase(Base):
-
     def _assert_cached_files_exist(self, exists, remove=False):
         path = os.path.join(tempfile.gettempdir(),
                             'chromedriver_{0}.zip'.format(self.version))
@@ -208,9 +110,8 @@ def _assert_cached_files_exist(self, exists, remove=False):
 
         assert os.path.exists(path) is exists
 
-    def _test_version(self, version_info, cached):
-        self.version = version_info
-        self.checksums = VERSIONS[version_info]
+    def _test_version(self, version, cached):
+        self.version, self.checksums = version
 
         # Chromedriver executable should not be available.
         self._not_available()
@@ -222,16 +123,16 @@ def _test_version(self, version_info, cached):
         subprocess.check_call(shlex.split(self._get_install_command()))
 
         # ...the chromedriver executable should be available...
-        expected_version = subprocess.Popen(
+        expected_version, error = subprocess.Popen(
             shlex.split('chromedriver -v'),
             stdout=subprocess.PIPE
-        ).communicate()[0]
+        ).communicate()
 
         # ...and should be of the right version.
         assert self.version in str(expected_version)
 
-    def test_version_uncached(self, version_info):
-        self._test_version(version_info, cached=False)
+    def test_version_uncached(self, version):
+        self._test_version(version, cached=False)
 
 
 class TestVersionOnly(VersionBase):
@@ -249,5 +150,5 @@ def _get_install_command(self):
             '--install-option="--chromedriver-checksums={1}"'
         ).format(self.version, ','.join(self.checksums))
 
-    def test_version_cached(self, version_info):
-        self._test_version(version_info, cached=True)
+    def test_version_cached(self, version):
+        self._test_version(version, cached=True)

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist=py27, py34
+envlist=py27, py36
 
 [testenv]
 skip_install=True