From 6feb35abfb38dfbf200c18e371880b1f776c1072 Mon Sep 17 00:00:00 2001 From: "Ilya.Kazakevich" Date: Wed, 11 Dec 2019 15:33:50 +0300 Subject: [PATCH] tests for unittest2 removed (not used anymore) GitOrigin-RevId: 91bb6d580e7527ab69216f1ae4143be065d5bbc2 --- python/setup-test-environment/build.gradle | 4 +- .../env/unit/unittest2/test_test.py | 10 ----- .../python/testing/PythonUnitTestingTest.java | 37 ------------------- 3 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 python/testData/testRunner/env/unit/unittest2/test_test.py diff --git a/python/setup-test-environment/build.gradle b/python/setup-test-environment/build.gradle index 36d92c3ab708..7111335c01ea 100644 --- a/python/setup-test-environment/build.gradle +++ b/python/setup-test-environment/build.gradle @@ -96,9 +96,9 @@ envs { createPython("py27_django11_full", python27version, - ["django==1.11", "tox>=3.8.3", "nose", "pytest", "Twisted", "behave", "unittest2", "teamcity-messages", "django-nose", + ["django==1.11", "tox>=3.8.3", "nose", "pytest", "Twisted", "behave", "teamcity-messages", "django-nose", "untangle"] + ( Os.isFamily(Os.FAMILY_WINDOWS) ? ['pypiwin32'] : [] ), //win32api is required for pypiwin32 - "python2.7\ndjango\nnose\npytest\nbehave\nnpackaging\ntox\nunittest2\ntwisted\ndjango-nose\nuntangle\nmessages", + "python2.7\ndjango\nnose\npytest\nbehave\nnpackaging\ntox\ntwisted\ndjango-nose\nuntangle\nmessages", true) createPython("py38_django22_full", diff --git a/python/testData/testRunner/env/unit/unittest2/test_test.py b/python/testData/testRunner/env/unit/unittest2/test_test.py deleted file mode 100644 index 061c4e82e909..000000000000 --- a/python/testData/testRunner/env/unit/unittest2/test_test.py +++ /dev/null @@ -1,10 +0,0 @@ - -from unittest2 import TestCase - - -class SampleTest(TestCase): - - def test_sample(self): - for i in range(10): - with self.subTest(i=i): - self.assertTrue(i > 3) \ No newline at end of file diff --git a/python/testSrc/com/jetbrains/env/python/testing/PythonUnitTestingTest.java b/python/testSrc/com/jetbrains/env/python/testing/PythonUnitTestingTest.java index b2733be449d0..0b6343dc4ea7 100644 --- a/python/testSrc/com/jetbrains/env/python/testing/PythonUnitTestingTest.java +++ b/python/testSrc/com/jetbrains/env/python/testing/PythonUnitTestingTest.java @@ -46,7 +46,6 @@ import java.util.List; import static com.intellij.testFramework.assertions.Assertions.assertThat; import static com.jetbrains.env.ut.PyScriptTestProcessRunner.TEST_TARGET_PREFIX; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; /** * @author traff @@ -448,42 +447,6 @@ public final class PythonUnitTestingTest extends PythonUnitTestingLikeTest