From ef41f6599608d665e560e097420969d0c3b87e10 Mon Sep 17 00:00:00 2001
From: Sebastian Lohff <seba@someserver.de>
Date: Mon, 7 Sep 2020 00:31:10 +0200
Subject: [PATCH] Workaround for python2 deprecation in tests

When checking the version the test now gets a
CryptographyDeprecationWarning plus an import code line instead of the
version. As a workaround we now ignore the first two lines when checking
for the version string.
---
 tests/test_servefile.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/test_servefile.py b/tests/test_servefile.py
index 1f19bb2..ef89f90 100644
--- a/tests/test_servefile.py
+++ b/tests/test_servefile.py
@@ -97,6 +97,12 @@ def _test_version(run_servefile, standalone):
     s.wait()
     version = s.stdout.readline().decode().strip()
 
+    # python2 is deprecated, but we still want our tests to run for it
+    # CryptographyDeprecationWarnings get in the way for this
+    if 'CryptographyDeprecationWarning' in version:
+        s.stdout.readline()  # ignore "from x import y" line
+        version = s.stdout.readline().decode().strip()
+
     # hardcode version as string until servefile is a module
     assert version == 'servefile 0.4.4'