From 3beccf0592a9816c7a4f058936c421441aa02b8d Mon Sep 17 00:00:00 2001
From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Wed, 22 Jul 2020 10:26:11 -0600
Subject: [PATCH 1/2] Set a higher timeout for the VirtualEnv Service test.

---
 .../discovery/locators/workspaceVirtualEnvService.test.ts      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/pythonEnvironments/discovery/locators/workspaceVirtualEnvService.test.ts b/src/test/pythonEnvironments/discovery/locators/workspaceVirtualEnvService.test.ts
index fbd30b076449..7bb93205ed0c 100644
--- a/src/test/pythonEnvironments/discovery/locators/workspaceVirtualEnvService.test.ts
+++ b/src/test/pythonEnvironments/discovery/locators/workspaceVirtualEnvService.test.ts
@@ -75,7 +75,8 @@ class Venvs {
     }
 }
 
-const timeoutMs = IS_CI_SERVER ? 60_000 : 15_000;
+const baseTimeoutMs = 30_000;
+const timeoutMs = IS_CI_SERVER ? baseTimeoutMs * 4 : baseTimeoutMs;
 suite('Interpreters - Workspace VirtualEnv Service', function () {
     this.timeout(timeoutMs);
     this.retries(0);

From db09f869163509309b59a8ab953eb13ff4e38fb7 Mon Sep 17 00:00:00 2001
From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Wed, 22 Jul 2020 10:28:56 -0600
Subject: [PATCH 2/2] Add a NEWS entry.

---
 news/2 Fixes/12833.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 news/2 Fixes/12833.md

diff --git a/news/2 Fixes/12833.md b/news/2 Fixes/12833.md
new file mode 100644
index 000000000000..7cfb9576133e
--- /dev/null
+++ b/news/2 Fixes/12833.md	
@@ -0,0 +1,3 @@
+The change in PR #12795 led to one particular test suite to take longer
+to run.  Here we increase the timeout for that suite to get the test
+passing.