tweaks on a weedy laptop

dls-controls · Jul 3, 2020 · c693f0b · c693f0b
1 parent e2bd351
commit c693f0b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,5 +1,4 @@
 {
-    "python.pythonPath": "/home/tom/.local/share/virtualenvs/aioca-4YYuDdK-/bin/python",
     "python.linting.pylintEnabled": false,
     "python.linting.flake8Enabled": true,
     "python.linting.enabled": true,
@@ -8,8 +7,5 @@
     "python.testing.nosetestsEnabled": false,
     "python.testing.pytestEnabled": true,
     "python.formatting.provider": "black",
-    "python.jediEnabled": false,
-    "vsintellicode.python.completionsEnabled": true,
-    "restructuredtext.confPath": "${workspaceFolder}/docs"
-
+    "python.languageServer": "Microsoft"
 }
diff --git a/tests/test_aioca.py b/tests/test_aioca.py
@@ -130,7 +130,8 @@ async def test_cainfo(ioc: subprocess.Popen) -> None:
 
 @pytest.mark.asyncio
 async def test_get_ne_pvs_no_throw(ioc: subprocess.Popen) -> None:
-    values = await caget([WAVEFORM, NE], throw=False, timeout=2.0)
+    wait_for_ioc(ioc)
+    values = await caget([WAVEFORM, NE], throw=False, timeout=1.0)
     assert [True, False] == [v.ok for v in values]
     assert pytest.approx([]) == values[0]
     ioc.communicate("exit")