[3.10] bpo-46198: rename duplicate tests and remove unused code (GH-30297) (GH-31796)

(cherry picked from commit 6c83c8e6b5)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
This commit is contained in:
Jelle Zijlstra 2022-03-10 13:53:50 -08:00 committed by GitHub
parent 3386f87dcb
commit 4199b7ffbb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 7 additions and 14 deletions

View file

@ -1861,8 +1861,6 @@ class TestDate(HarmlessMixedComparison, unittest.TestCase):
def test_fromisoformat_fails_typeerror(self):
# Test that fromisoformat fails when passed the wrong type
import io
bad_types = [b'2009-03-01', None, io.StringIO('2009-03-01')]
for bad_type in bad_types:
with self.assertRaises(TypeError):
@ -3985,8 +3983,6 @@ class TestTimeTZ(TestTime, TZInfoBase, unittest.TestCase):
def test_fromisoformat_fails_typeerror(self):
# Test the fromisoformat fails when passed the wrong type
import io
bad_types = [b'12:30:45', None, io.StringIO('12:30:45')]
for bad_type in bad_types:

View file

@ -1381,9 +1381,6 @@ class PythonSymlink:
self._platform_specific()
def _platform_specific(self):
pass
if sys.platform == "win32":
def _platform_specific(self):
import glob
@ -1411,6 +1408,9 @@ class PythonSymlink:
self._env["PYTHONHOME"] = os.path.dirname(self.real)
if sysconfig.is_python_build(True):
self._env["PYTHONPATH"] = os.path.dirname(os.__file__)
else:
def _platform_specific(self):
pass
def __enter__(self):
os.symlink(self.real, self.link)

View file

@ -2,7 +2,6 @@
import logging
import socket
from test import support
import unittest
import weakref
from unittest import mock

View file

@ -32,7 +32,7 @@ def coding_checker(self, coder):
# On small versions of Windows like Windows IoT or Windows Nano Server not all codepages are present
def is_code_page_present(cp):
from ctypes import POINTER, WINFUNCTYPE, WinDLL
from ctypes.wintypes import BOOL, UINT, BYTE, WCHAR, UINT, DWORD
from ctypes.wintypes import BOOL, BYTE, WCHAR, UINT, DWORD
MAX_LEADBYTES = 12 # 5 ranges, 2 bytes ea., 0 term.
MAX_DEFAULTCHAR = 2 # single or double byte

View file

@ -1023,7 +1023,7 @@ class TestExpressionStackSize(unittest.TestCase):
kwargs = (f'a{i}=x' for i in range(self.N))
self.check_stack_size("f(" + ", ".join(kwargs) + ")")
def test_func_args(self):
def test_meth_args(self):
self.check_stack_size("o.m(" + "x, " * self.N + ")")
def test_meth_kwargs(self):

View file

@ -1465,7 +1465,7 @@ class DictTest(unittest.TestCase):
self.assertTrue(gc.is_tracked(next(it)))
@support.cpython_only
def test_dict_items_result_gc(self):
def test_dict_items_result_gc_reversed(self):
# Same as test_dict_items_result_gc above, but reversed.
it = reversed({None: []}.items())
gc.collect()

View file

@ -395,7 +395,7 @@ class TestParser(TestParserMixin, TestEmailBase):
[errors.InvalidHeaderDefect],
'')
def test_get_unstructured_invalid_ew(self):
def test_get_unstructured_invalid_ew2(self):
self._test_get_x(self._get_unst,
'=?utf-8?q?=somevalue?=',
'=?utf-8?q?=somevalue?=',

View file

@ -16,7 +16,6 @@ import io # readline
import unittest
import struct
import tty
import fcntl
import warnings

View file

@ -4,7 +4,6 @@ Glossary:
* errored : Whitespace related problems present in file.
"""
from unittest import TestCase, mock
from unittest import mock
import errno
import os
import tabnanny