From 146c9dc501655b8e151b44fc34fa446f4a8e70f9 Mon Sep 17 00:00:00 2001 From: Donnie Adams Date: Mon, 22 Jul 2024 11:53:44 -0400 Subject: [PATCH] fix: use separate gptscript file for cred override on Windows Signed-off-by: Donnie Adams --- tests/fixtures/credential-override-windows.gpt | 5 +++++ tests/test_gptscript.py | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 tests/fixtures/credential-override-windows.gpt diff --git a/tests/fixtures/credential-override-windows.gpt b/tests/fixtures/credential-override-windows.gpt new file mode 100644 index 0000000..7e5764c --- /dev/null +++ b/tests/fixtures/credential-override-windows.gpt @@ -0,0 +1,5 @@ +credentials: github.com/gptscript-ai/credential as test.ts.credential_override with TEST_CRED as env + +#!/usr/bin/env powershell.exe + +echo "$env:TEST_CRED" diff --git a/tests/test_gptscript.py b/tests/test_gptscript.py index c12f719..3ea280d 100644 --- a/tests/test_gptscript.py +++ b/tests/test_gptscript.py @@ -62,7 +62,7 @@ def complex_tool(): @pytest.fixture def tool_list(): shebang = "#!/bin/bash" - if platform.system() == "windows": + if platform.system().lower() == "windows": shebang = "#!/usr/bin/env powershell.exe" return [ ToolDef(tools=["echo"], instructions="echo 'hello there'"), @@ -185,8 +185,11 @@ async def collect_events(run: Run, e: CallFrame | RunFrame | PromptFrame): @pytest.mark.asyncio async def test_credential_override(gptscript): + gptscriptFile = "credential-override.gpt" + if platform.system().lower() == "windows": + gptscriptFile = "credential-override-windows.gpt" run = gptscript.run( - os.getcwd() + "/tests/fixtures/credential-override.gpt", + f"{os.getcwd()}{os.sep}tests{os.sep}fixtures{os.sep}{gptscriptFile}", Options( disableCache=True, credentialOverrides=['test.ts.credential_override:TEST_CRED=foo']