Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Lib/test/test_unittest/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import os.path

from test.support import load_package_tests


Expand Down
3 changes: 1 addition & 2 deletions Lib/test/test_unittest/__main__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import unittest

from . import load_tests
import unittest

unittest.main()
1 change: 0 additions & 1 deletion Lib/test/test_unittest/_test_warnings.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import unittest
import warnings


def warnfun():
warnings.warn('rw', RuntimeWarning)

Expand Down
Empty file.
5 changes: 5 additions & 0 deletions Lib/test/test_unittest/namespace_test_pkg/bar/test_bar.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import unittest

class PassingTest(unittest.TestCase):
def test_true(self):
self.assertTrue(True)
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import unittest

class PassingTest(unittest.TestCase):
def test_true(self):
self.assertTrue(True)
5 changes: 5 additions & 0 deletions Lib/test/test_unittest/namespace_test_pkg/noop/test_noop.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import unittest

class PassingTest(unittest.TestCase):
def test_true(self):
self.assertTrue(True)
5 changes: 5 additions & 0 deletions Lib/test/test_unittest/namespace_test_pkg/test_foo.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import unittest

class PassingTest(unittest.TestCase):
def test_true(self):
self.assertTrue(True)
5 changes: 2 additions & 3 deletions Lib/test/test_unittest/test_assertions.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import datetime
import unittest
import warnings
import weakref
from itertools import product

import unittest
from test.support import gc_collect
from itertools import product


class Test_Assertions(unittest.TestCase):
Expand Down
3 changes: 1 addition & 2 deletions Lib/test/test_unittest/test_async_case.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import asyncio
import contextvars
import unittest

from test import support
from test.support import force_not_colorized

Expand Down Expand Up @@ -297,7 +296,7 @@ async def on_cleanup2(self):
test.doCleanups()
self.assertEqual(events, ['asyncSetUp', 'test', 'asyncTearDown', 'cleanup2', 'cleanup1'])

@unittest.expectedFailure # TODO: RUSTPYTHON
@unittest.expectedFailure # TODO: RUSTPYTHON
def test_deprecation_of_return_val_from_test(self):
# Issue 41322 - deprecate return of value that is not None from a test
class Nothing:
Expand Down
4 changes: 2 additions & 2 deletions Lib/test/test_unittest/test_break.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import gc
import io
import os
import signal
import sys
import unittest
import signal
import weakref
import unittest

from test import support

Expand Down
24 changes: 12 additions & 12 deletions Lib/test/test_unittest/test_case.py
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
import contextlib
import difflib
import inspect
import logging
import pickle
import pprint
import pickle
import re
import sys
import types
import unittest
import logging
import warnings
import weakref
import inspect
import types

from collections import UserString
from copy import deepcopy

from test import support
from test.support import captured_stderr, gc_collect

import unittest

from test.test_unittest.support import (
LegacyLoggingResult,
LoggingResult,
ResultWithNoStartTestRunStopTestRun,
TestEquality,
TestHashing,
TestEquality, TestHashing, LoggingResult, LegacyLoggingResult,
ResultWithNoStartTestRunStopTestRun
)
from test.support import captured_stderr, gc_collect


log_foo = logging.getLogger('foo')
log_foobar = logging.getLogger('foo.bar')
Expand Down
13 changes: 6 additions & 7 deletions Lib/test/test_unittest/test_discovery.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import os.path
import pickle
from os.path import abspath
import re
import sys
import types
import unittest
import unittest.mock
import pickle
from importlib._bootstrap_external import NamespaceLoader
from os.path import abspath

import test.test_unittest
from test import support
from test.support import import_helper

import unittest
import unittest.mock
import test.test_unittest
from test.test_importlib import util as test_util


Expand Down Expand Up @@ -884,7 +884,6 @@ def _find_tests(start_dir, pattern, namespace=None):

self.assertEqual(suite, ['/a/tests', '/b/tests'])

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_discovery_start_dir_is_namespace(self):
"""Subdirectory discovery not affected if start_dir is a namespace pkg."""
loader = unittest.TestLoader()
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_unittest/test_loader.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import functools
import sys
import types
import unittest

import unittest

class Test_TestLoader(unittest.TestCase):

Expand Down
7 changes: 3 additions & 4 deletions Lib/test/test_unittest/test_program.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import os
import subprocess
import sys
import subprocess
from test import support
import unittest

import test.test_unittest
from test import support
from test.test_unittest.test_result import BufferedWriter


Expand Down Expand Up @@ -506,7 +505,7 @@ def testParseArgsSelectedTestNames(self):

self.assertEqual(program.testNamePatterns, ['*foo*', '*bar*', '*pat*'])

@unittest.expectedFailureIf(sys.platform != 'win32', 'TODO: RUSTPYTHON')
@unittest.expectedFailureIf(sys.platform != "win32", "TODO: RUSTPYTHON")
def testSelectedTestNamesFunctionalTest(self):
def run_unittest(args):
# Use -E to ignore PYTHONSAFEPATH env var
Expand Down
8 changes: 2 additions & 6 deletions Lib/test/test_unittest/test_result.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,8 @@
import traceback
import unittest
from unittest.util import strclass

from test.support import (
captured_stdout,
force_not_colorized_test_class,
warnings_helper,
)
from test.support import warnings_helper
from test.support import captured_stdout, force_not_colorized_test_class
from test.test_unittest.support import BufferedWriter


Expand Down
5 changes: 3 additions & 2 deletions Lib/test/test_unittest/test_runner.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import io
import os
import sys
import pickle
import subprocess
import sys
from test import support

import unittest
from unittest.case import _Outcome

from test import support
from test.test_unittest.support import (
BufferedWriter,
LoggingResult,
Expand Down
1 change: 1 addition & 0 deletions Lib/test/test_unittest/test_setups.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import io
import sys

import unittest


Expand Down
5 changes: 3 additions & 2 deletions Lib/test/test_unittest/test_suite.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import unittest

import gc
import sys
import unittest
import weakref

from test.test_unittest.support import LoggingResult, TestEquality


### Support code for Test_TestSuite
################################################################

Expand Down
6 changes: 1 addition & 5 deletions Lib/test/test_unittest/test_util.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import unittest
from unittest.util import (
safe_repr,
sorted_list_difference,
unorderable_list_difference,
)
from unittest.util import safe_repr, sorted_list_difference, unorderable_list_difference


class TestUtil(unittest.TestCase):
Expand Down
Loading
Loading