Merge branch 'NoctuaNivalis-fix/#1308'

2016-02-15 22:08:50 +01:00 · 2016-02-15 22:08:50 +01:00 · aad8dfc0ce
commit aad8dfc0ce
parent ff779ef329 9a18bc4ced
2 changed files with 2 additions and 2 deletions
--- a/README.asciidoc
+++ b/README.asciidoc
@ -148,8 +148,8 @@ Contributors, sorted by the number of commits in descending order:
 * Alexander Cogneau
 * Martin Tournoij
 * Raphael Pierzina
-* Joel Torstensson
 * Felix Van der Jeugt
+* Joel Torstensson
 * Claude
 * Patric Schmitz
 * meles5
--- a/tests/conftest.py
+++ b/tests/conftest.py
@ -172,7 +172,7 @@ def pytest_configure(config):
        try:
            disp = xvfbwrapper.Xvfb(width=800, height=600, colordepth=16)
            disp.start()
-        except FileNotFoundError:
+        except EnvironmentError:
            # We run without Xvfb if it's unavailable.
            pass
        else: