From 0ed3513468cca0c998a4de7bad3936d1a69609ca Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Wed, 23 Sep 2020 13:44:02 -0700 Subject: [PATCH] rebase with main --- pythonFiles/tests/testing_tools/adapter/test_functional.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pythonFiles/tests/testing_tools/adapter/test_functional.py b/pythonFiles/tests/testing_tools/adapter/test_functional.py index b10ac411884e..f32d588aa7f2 100644 --- 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)