coverage: exclude environment branches in test cases

since some branching in hypothesis strategies and in handling
different python, hypothesis, openssl and unittest versions is necessary,
ignore them for branch coverage

remove benchmarking code and dead code from test_pyecdsa.py
(we have speed.py now)

and exclude a disabled test case from coverage

Author: tomato42

src/ecdsa/test_ecdsa.py

@@ -15,7 +15,7 @@
 
 HYP_SETTINGS = {}
 # old hypothesis doesn't have the "deadline" setting
-if sys.version_info > (2, 7):
+if sys.version_info > (2, 7):  # pragma: no branch
     # SEC521p is slow, allow long execution for it
     HYP_SETTINGS["deadline"] = 5000
 

src/ecdsa/test_ellipticcurve.py

@@ -9,14 +9,14 @@
 try:
     from hypothesis import HealthCheck
     HC_PRESENT=True
-except ImportError:
+except ImportError:  # pragma: no cover
     HC_PRESENT=False
 from .numbertheory import inverse_mod
 from .ellipticcurve import CurveFp, INFINITY, Point
 
 
 HYP_SETTINGS={}
-if HC_PRESENT:
+if HC_PRESENT:  # pragma: no branch
     HYP_SETTINGS['suppress_health_check']=[HealthCheck.too_slow]
     HYP_SETTINGS['deadline'] = 5000
 

src/ecdsa/test_malformed_sigs.py

@@ -3,7 +3,7 @@
 import hashlib
 try:
     from hashlib import algorithms_available
-except ImportError:
+except ImportError:  # pragma: no cover
     algorithms_available = [
         "md5", "sha1", "sha224", "sha256", "sha384", "sha512"]
 from functools import partial
@@ -82,7 +82,7 @@ def st_fuzzed_sig(draw, keys_and_sigs):
     note("Remove bytes: {0}".format(to_remove))
 
     # decide which bytes of the original signature should be changed
-    if sig:
+    if sig:  # pragma: no branch
         xors = draw(st.dictionaries(
             st.integers(min_value=0, max_value=len(sig)-1),
             st.integers(min_value=1, max_value=255)))
@@ -110,7 +110,7 @@ def st_fuzzed_sig(draw, keys_and_sigs):
 
 params = {}
 # not supported in hypothesis 2.0.0
-if sys.version_info >= (2, 7):
+if sys.version_info >= (2, 7):  # pragma: no branch
     from hypothesis import HealthCheck
     # deadline=5s because NIST521p are slow to verify
     params["deadline"] = 5000
@@ -180,7 +180,7 @@ def st_der_integer(*args, **kwargs):
     INTEGER.
     Parameters are passed to hypothesis.strategy.integer.
     """
-    if "min_value" not in kwargs:
+    if "min_value" not in kwargs:  # pragma: no branch
         kwargs["min_value"] = 0
     return st.builds(encode_integer, st.integers(*args, **kwargs))
 

src/ecdsa/test_numbertheory.py

@@ -12,7 +12,7 @@
 try:
     from hypothesis import HealthCheck
     HC_PRESENT=True
-except ImportError:
+except ImportError:  # pragma: no cover
     HC_PRESENT=False
 from .numbertheory import (SquareRootError, factorization, gcd, lcm,
                            jacobi, inverse_mod,
@@ -85,7 +85,7 @@ def st_two_nums_rel_prime(draw):
 
 @st.composite
 def st_primes(draw, *args, **kwargs):
-    if "min_value" not in kwargs:
+    if "min_value" not in kwargs:  # pragma: no branch
         kwargs["min_value"] = 1
     prime = draw(st.sampled_from(smallprimes) |
                  st.integers(*args, **kwargs)
@@ -161,7 +161,7 @@ def st_comp_no_com_fac(draw):
 
 
 HYP_SETTINGS = {}
-if HC_PRESENT:
+if HC_PRESENT:  # pragma: no branch
     HYP_SETTINGS['suppress_health_check']=[HealthCheck.filter_too_much,
                                            HealthCheck.too_slow]
     # the factorization() sometimes takes a long time to finish

src/ecdsa/test_pyecdsa.py

@@ -52,9 +52,6 @@ def run_openssl(cmd):
     return stdout.decode()
 
 
-BENCH = False
-
-
 class ECDSA(unittest.TestCase):
     def test_basic(self):
         priv = SigningKey.generate()
@@ -103,8 +100,6 @@ def test_lengths(self):
         self.assertEqual(len(pub.to_string()), default.verifying_key_length)
         sig = priv.sign(b("data"))
         self.assertEqual(len(sig), default.signature_length)
-        if BENCH:
-            print_()
         for curve in (NIST192p, NIST224p, NIST256p, NIST384p, NIST521p,
                       BRAINPOOLP160r1, BRAINPOOLP192r1, BRAINPOOLP224r1,
                       BRAINPOOLP256r1, BRAINPOOLP320r1, BRAINPOOLP384r1,
@@ -121,13 +116,6 @@ def test_lengths(self):
             sig = priv.sign(b("data"))
             sign_time = time.time() - start
             self.assertEqual(len(sig), curve.signature_length)
-            if BENCH:
-                start = time.time()
-                pub1.verify(sig, b("data"))
-                verify_time = time.time() - start
-                print_("%s: siglen=%d, keygen=%0.3fs, sign=%0.3f, verify=%0.3f" \
-                       % (curve.name, curve.signature_length,
-                          keygen_time, sign_time, verify_time))
 
     def test_serialize(self):
         seed = b("secret")
@@ -177,10 +165,6 @@ def assertTruePrivkeysEqual(self, priv1, priv2):
         self.assertEqual(priv1.privkey.public_key.generator,
                          priv2.privkey.public_key.generator)
 
-    def failIfPrivkeysEqual(self, priv1, priv2):
-        self.failIfEqual(priv1.privkey.secret_multiplier,
-                         priv2.privkey.secret_multiplier)
-
     def test_privkey_creation(self):
         s = b("all the entropy in the entire world, compressed into one line")
 
@@ -729,9 +713,9 @@ def get_openssl_messagedigest_arg(self):
         # e.g. "OpenSSL 1.0.0 29 Mar 2010", or "OpenSSL 1.0.0a 1 Jun 2010",
         # or "OpenSSL 0.9.8o 01 Jun 2010"
         vs = v.split()[1].split(".")
-        if vs >= ["1", "0", "0"]:
+        if vs >= ["1", "0", "0"]:  # pragma: no cover
             return "-SHA1"
-        else:
+        else:  # pragma: no cover
             return "-ecdsa-with-SHA1"
 
     # sk: 1:OpenSSL->python  2:python->OpenSSL
@@ -809,7 +793,7 @@ def do_test_from_openssl(self, curve):
         # OpenSSL: create sk, vk, sign.
         # Python: read vk(3), checksig(5), read sk(1), sign, check
         mdarg = self.get_openssl_messagedigest_arg()
-        if os.path.isdir("t"):
+        if os.path.isdir("t"):  # pragma: no cover
             shutil.rmtree("t")
         os.mkdir("t")
         run_openssl("ecparam -name %s -genkey -out t/privkey.pem" % curvename)
@@ -904,7 +888,7 @@ def do_test_to_openssl(self, curve):
         # Python: create sk, vk, sign.
         # OpenSSL: read vk(4), checksig(6), read sk(2), sign, check
         mdarg = self.get_openssl_messagedigest_arg()
-        if os.path.isdir("t"):
+        if os.path.isdir("t"):  # pragma: no cover
             shutil.rmtree("t")
         os.mkdir("t")
         sk = SigningKey.generate(curve=curve)
@@ -1019,7 +1003,7 @@ def test_randrange(self, i):
             n = util.randrange(order, entropy=entropy)
             self.assertTrue(1 <= n < order, (1, n, order))
 
-    def OFF_test_prove_uniformity(self):
+    def OFF_test_prove_uniformity(self):  # pragma: no cover
         order = 2**8 - 2
         counts = dict([(i, 0) for i in range(1, order)])
         assert 0 not in counts