Skip to content

Commit

Permalink
[3.9] bpo-46198: rename duplicate tests and remove unused code (GH-30297
Browse files Browse the repository at this point in the history
) (GH-31797)

(cherry picked from commit 6c83c8e)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
  • Loading branch information
JelleZijlstra and sobolevn authored Mar 10, 2022
1 parent 0c47008 commit f7f7838
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 12 deletions.
4 changes: 0 additions & 4 deletions Lib/test/datetimetester.py
Original file line number Diff line number Diff line change
Expand Up @@ -1861,8 +1861,6 @@ def test_fromisoformat_fails(self):

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):
Expand Down Expand Up @@ -3985,8 +3983,6 @@ def test_fromisoformat_fails(self):

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:
Expand Down
6 changes: 3 additions & 3 deletions Lib/test/support/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2390,9 +2390,6 @@ def __init__(self, link=None):

self._platform_specific()

def _platform_specific(self):
pass

if sys.platform == "win32":
def _platform_specific(self):
import _winapi
Expand All @@ -2419,6 +2416,9 @@ def _platform_specific(self):
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)
Expand Down
1 change: 0 additions & 1 deletion Lib/test/test_asyncio/test_sslproto.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import logging
import socket
from test import support
import unittest
import weakref
from unittest import mock
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_codecs.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def check(input, expect):
# 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
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_dict.py
Original file line number Diff line number Diff line change
Expand Up @@ -1435,7 +1435,7 @@ def test_dict_items_result_gc(self):
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()
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_email/test__header_value_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ def test_get_unstructured_without_trailing_whitespace_hang_case(self):
[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?=',
Expand Down
1 change: 0 additions & 1 deletion Lib/test/test_tabnanny.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* errored : Whitespace related problems present in file.
"""
from unittest import TestCase, mock
from unittest import mock
import errno
import os
import tabnanny
Expand Down

0 comments on commit f7f7838

Please sign in to comment.