From c693f0b7565cf3c4b91b1259cbf0fc122f299ece Mon Sep 17 00:00:00 2001 From: Cobb Date: Fri, 3 Jul 2020 15:38:24 +0100 Subject: [PATCH] tweaks on a weedy laptop --- .vscode/settings.json | 6 +----- tests/test_aioca.py | 3 ++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index da50cde..7861639 100644 --- 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" } \ No newline at end of file diff --git a/tests/test_aioca.py b/tests/test_aioca.py index 18190a3..ba8b884 100644 --- 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")