chore: rename test helpers script file

Signed-off-by: Claudio Matsuoka <claudio.matsuoka@canonical.com>
canonical · Mar 22, 2024 · 9153264 · 9153264
1 parent 999cb05
commit 9153264
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/charmcraft/application/commands/init.py b/charmcraft/application/commands/init.py
@@ -76,9 +76,11 @@
     ├── tests
     │   ├── spread
     │   │   ├── lib
-    │   │   │   └── funcs.sh   - Helpers for spread testing
-    │   │   └── minimal
-    │   │       └── task.yaml  - Minimal task definition
+    │   │   │   ├── cloud-config.yaml
+    │   │   │   └── test-helpers.yaml
+    │   │   └── general
+    │   │       └── integration
+    │   │           └── task.yaml
     │   ├── integration
     │   │   └── test_charm.py  - Integration tests
     │   └── unit

diff --git a/charmcraft/templates/init-machine/spread.yaml.j2 b/charmcraft/templates/init-machine/spread.yaml.j2
@@ -99,7 +99,7 @@ suites:
 
     prepare: |
       set -e
-      . "$CRAFT_TEST_LIB_PATH"/funcs.sh
+      . "$CRAFT_TEST_LIB_PATH"/test-helpers.sh
       apt update -y
       apt install -y python3-pip
       pip3 install tox
@@ -113,7 +113,7 @@ suites:
 
     restore: |
       set -e
-      . "$CRAFT_TEST_LIB_PATH"/funcs.sh
+      . "$CRAFT_TEST_LIB_PATH"/test-helpers.sh
       rm -f "$PROJECT_PATH"/*.charm
       charmcraft clean -p "$PROJECT_PATH"
 

diff --git a/...init-machine/tests/spread/lib/funcs.sh.j2 → ...chine/tests/spread/lib/test-helpers.sh.j2 b/...init-machine/tests/spread/lib/funcs.sh.j2 → ...chine/tests/spread/lib/test-helpers.sh.j2