From a9bf1c1d1f4a94fd078df16c4d445941171292c7 Mon Sep 17 00:00:00 2001
From: "Ilya.Kazakevich" <Ilya.Kazakevich@jetbrains.com>
Date: Fri, 31 Mar 2017 18:11:41 +0300
Subject: [PATCH] PY-23488: Special case added to unittest-based subtests

---
 python/helpers/pycharm/_jb_runner_tools.py    | 14 +++++++++++++
 .../env/unit/test_skipped_subtest.py          | 21 +++++++++++++++++++
 .../env/PyAbstractTestProcessRunner.java      |  6 +++++-
 .../com/jetbrains/env/SMRootTestsCounter.java |  4 ++++
 .../python/testing/PythonUnitTestingTest.java | 14 +++++++++++++
 5 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 python/testData/testRunner/env/unit/test_skipped_subtest.py

diff --git a/python/helpers/pycharm/_jb_runner_tools.py b/python/helpers/pycharm/_jb_runner_tools.py
index f05f4b314575..cce7cc6190a6 100644
--- a/python/helpers/pycharm/_jb_runner_tools.py
+++ b/python/helpers/pycharm/_jb_runner_tools.py
@@ -218,6 +218,20 @@ class NewTeamcityServiceMessages(_old_service_messages):
         self.testFinished(test_name)
         self._latest_subtest_result = None
 
+
+    def testIgnored(self, testName, message='', flowId=None):
+        import re
+        # Skipped subtest of unittest in format "test_name.test_name (subtestInfo)" should be processed as special case:
+        # start, ignore like test_name.test_name.(subtestInfo), stop
+        match_result = re.match(r"^([^(]+\s)*([(][^)]+[)])$", str(testName))
+        if match_result:
+            test_to_skip = ".".join(TREE_MANAGER.current_branch + [match_result.group(2)])
+            self.testStarted(test_to_skip)
+            super(NewTeamcityServiceMessages, self).testIgnored(test_to_skip, message, flowId)
+            self.testFinished(test_to_skip)
+        else:
+            super(NewTeamcityServiceMessages, self).testIgnored(testName, message, flowId) # For all other cases leave same behaviour
+
     def subTestBlockOpened(self, name, subTestResult, flowId=None):
         self.testStarted(".".join(TREE_MANAGER.current_branch + [name]))
         self._latest_subtest_result = subTestResult
diff --git a/python/testData/testRunner/env/unit/test_skipped_subtest.py b/python/testData/testRunner/env/unit/test_skipped_subtest.py
new file mode 100644
index 000000000000..21ac9d53a14d
--- /dev/null
+++ b/python/testData/testRunner/env/unit/test_skipped_subtest.py
@@ -0,0 +1,21 @@
+import unittest
+
+
+class SampleTest(unittest.TestCase):
+    widget = None
+
+    def setUp(self):
+        self.widget = 'abcd'
+
+    def tearDown(self):
+        self.widget = None
+
+    def test_foo(self):
+        for i in range(20):
+            with self.subTest(i=i):
+                if i % 2:
+                    self.assertTrue(False)
+                elif not (i % 5):
+                    self.skipTest('it happen')
+                else:
+                    self.assertEqual(self.widget, 'abcd')
\ No newline at end of file
diff --git a/python/testSrc/com/jetbrains/env/PyAbstractTestProcessRunner.java b/python/testSrc/com/jetbrains/env/PyAbstractTestProcessRunner.java
index 697bcca15a51..23179676c8d1 100644
--- a/python/testSrc/com/jetbrains/env/PyAbstractTestProcessRunner.java
+++ b/python/testSrc/com/jetbrains/env/PyAbstractTestProcessRunner.java
@@ -142,7 +142,7 @@ public class PyAbstractTestProcessRunner<CONF_T extends AbstractPythonRunConfigu
     builder.append(StringUtil.repeat(".", level));
     builder.append(test.getName());
     if (test.isLeaf()) {
-      builder.append(test.isPassed() ? "(+)" : "(-)");
+      builder.append(test.isPassed() ? "(+)" : (test.isIgnored() ? "(~)" : "(-)"));
     }
     builder.append('\n');
     for (SMTestProxy child : test.getChildren()) {
@@ -186,6 +186,10 @@ public class PyAbstractTestProcessRunner<CONF_T extends AbstractPythonRunConfigu
     return myProxyManager.getPassedTestsCount();
   }
 
+  public int getIgnoredTestsCount() {
+    return myProxyManager.getIgnoredTestsCount();
+  }
+
   /**
    * @return number of all tests
    */
diff --git a/python/testSrc/com/jetbrains/env/SMRootTestsCounter.java b/python/testSrc/com/jetbrains/env/SMRootTestsCounter.java
index 4c9274b91806..56a943b21c64 100644
--- a/python/testSrc/com/jetbrains/env/SMRootTestsCounter.java
+++ b/python/testSrc/com/jetbrains/env/SMRootTestsCounter.java
@@ -64,6 +64,10 @@ final class SMRootTestsCounter {
     return myTestProxy.collectChildren(NOT_SUIT.and(Filter.PASSED)).size();
   }
 
+  int getIgnoredTestsCount() {
+    return myTestProxy.collectChildren(NOT_SUIT.and(Filter.IGNORED)).size();
+  }
+
 
   /**
    * @return number of all tests
diff --git a/python/testSrc/com/jetbrains/env/python/testing/PythonUnitTestingTest.java b/python/testSrc/com/jetbrains/env/python/testing/PythonUnitTestingTest.java
index 35dc3bbb3612..62670fc0e028 100644
--- a/python/testSrc/com/jetbrains/env/python/testing/PythonUnitTestingTest.java
+++ b/python/testSrc/com/jetbrains/env/python/testing/PythonUnitTestingTest.java
@@ -73,7 +73,21 @@ public final class PythonUnitTestingTest extends PyEnvTestCase {
                                       "....(i=8)(-)\n" +
                                       "....(i=9)(+)\n";
         Assert.assertEquals("", expectedResult, runner.getFormattedTestTree());
+      }
+    });
+  }
 
+  @EnvTestTagsRequired(tags = "python3") // No subtest in py2
+  @Test
+  public void testSubtestSkipped() throws Exception {
+    runPythonTest(new PyUnitTestProcessWithConsoleTestTask("testRunner/env/unit/", "test_skipped_subtest.py") {
+      @Override
+      protected void checkTestResults(@NotNull PyUnitTestProcessRunner runner,
+                                      @NotNull String stdout,
+                                      @NotNull String stderr,
+                                      @NotNull String all) {
+        Assert.assertEquals(runner.getFormattedTestTree(), 8, runner.getPassedTestsCount());
+        Assert.assertEquals(runner.getFormattedTestTree(), 2, runner.getIgnoredTestsCount());
       }
     });
   }