rebase with main

microsoft · Sep 23, 2020 · 0ed3513 · 0ed3513
1 parent 14a97a8
commit 0ed3513
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/pythonFiles/tests/testing_tools/adapter/test_functional.py b/pythonFiles/tests/testing_tools/adapter/test_functional.py
@@ -10,8 +10,6 @@
 import sys
 import unittest
 
-import pytest
-
 from ...__main__ import TESTING_TOOLS_ROOT
 from testing_tools.adapter.util import fix_path, PATH_SEP
 
@@ -149,7 +147,6 @@ def test_discover_simple(self):
             ],
         )
 
-    @pytest.mark.skip(reason="https://github.com/microsoft/vscode-python/issues/14023")
     def test_discover_complex_default(self):
         projroot, testroot = resolve_testroot("complex")
         expected = self.complex(projroot)
@@ -170,7 +167,6 @@ def test_discover_complex_default(self):
         self.maxDiff = None
         self.assertEqual(sorted_object(result), sorted_object(expected))
 
-    @pytest.mark.skip(reason="https://github.com/microsoft/vscode-python/issues/14023")
     def test_discover_complex_doctest(self):
         projroot, _ = resolve_testroot("complex")
         expected = self.complex(projroot)