Skip to content

Commit 52aed69

Browse files
committed
Fix jigsaw workflow test
1 parent 919de61 commit 52aed69

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

workflow_tests/test_meshflow_jigsaw_workflow.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import os
2+
import re
23
import sys
34
from pathlib import Path
45

@@ -85,7 +86,7 @@ def test_meshflow_deploy_workflow_installs_jigsaw_into_deployed_manifest(
8586
'source load_meshflow.sh && '
8687
'test "${MESHFLOW_DEPLOY_SENTINEL}" = "workflow-ok" && '
8788
'python -c "import lxml.etree, mache.jigsaw, jigsawpy; '
88-
'print(jigsawpy.__version__)"',
89+
'print(jigsawpy.__file__)"',
8990
],
9091
cwd=downstream,
9192
env=env,
@@ -146,19 +147,19 @@ def test_meshflow_cli_jigsaw_install_uses_local_pixi_manifest(
146147
)
147148
assert local_manifest.is_file()
148149
local_text = local_manifest.read_text(encoding='utf-8')
149-
assert '[feature.jigsaw.dependencies]' in local_text
150-
assert 'jigsaw = ["jigsaw"]' in local_text
151-
assert 'jigsawpy' not in (downstream / 'pixi-env' / 'pixi.toml').read_text(
150+
source_text = (downstream / 'pixi-env' / 'pixi.toml').read_text(
152151
encoding='utf-8'
153152
)
153+
assert re.search(r'(?m)^jigsawpy\s*=', local_text) is not None
154+
assert re.search(r'(?m)^jigsawpy\s*=', source_text) is None
154155

155156
smoke = run(
156157
[
157158
'bash',
158159
'-lc',
159160
'set -euo pipefail && '
160-
f'pixi run -m {local_manifest} -e jigsaw '
161-
'python -c "import jigsawpy; print(jigsawpy.__version__)"',
161+
f'pixi run -m {local_manifest} -- '
162+
'python -c "import jigsawpy; print(jigsawpy.__file__)"',
162163
],
163164
cwd=downstream,
164165
env=env,

0 commit comments

Comments
 (0)