bpo-38142: Remove refleak test from test_hashlib

The updated type no longer accepts random arguments to __init__.

Signed-off-by: Christian Heimes <[email protected]>

Author: tiran

Lib/test/test_hashlib.py

@@ -167,16 +167,6 @@ def hash_constructors(self):
         constructors = self.constructors_to_test.values()
         return itertools.chain.from_iterable(constructors)
 
-    @support.refcount_test
-    @unittest.skipIf(c_hashlib is None, 'Require _hashlib module')
-    def test_refleaks_in_hash___init__(self):
-        gettotalrefcount = support.get_attribute(sys, 'gettotalrefcount')
-        sha1_hash = c_hashlib.new('sha1')
-        refs_before = gettotalrefcount()
-        for i in range(100):
-            sha1_hash.__init__('sha1')
-        self.assertAlmostEqual(gettotalrefcount() - refs_before, 0, delta=10)
-
     def test_hash_array(self):
         a = array.array("b", range(10))
         for cons in self.hash_constructors:

Modules/_hashopenssl.c

@@ -34,12 +34,7 @@
 
 #define MUNCH_SIZE INT_MAX
 
-<<<<<<< HEAD
 #ifdef NID_sha3_224
-=======
-<<<<<<< HEAD
-#if defined(NID_sha3_224) && defined(EVP_MD_FLAG_XOF)
->>>>>>> bpo-38142: Updated _hashopenssl.c to be PEP 384 compliant
 #define PY_OPENSSL_HAS_SHA3 1
 #endif
 
@@ -50,7 +45,7 @@
 #ifdef NID_blake2b512
 #define PY_OPENSSL_HAS_BLAKE2 1
 #endif
-=======
+
 static PyModuleDef _hashlibmodule;
 
 typedef struct {
@@ -60,7 +55,6 @@ typedef struct {
 #define _hashlibstate(o) ((_hashlibstate *)PyModule_GetState(o))
 #define _hashlibstate_global ((_hashlibstate *)PyModule_GetState(PyState_FindModule(&_hashlibmodule)))
 
->>>>>>> bpo-38142: Updated _hashopenssl.c to be PEP 384 compliant
 
 typedef struct {
     PyObject_HEAD