fix test output

siakhooi · Nov 19, 2023 · 0dd7729 · 0dd7729
1 parent f711730
commit 0dd7729
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 34 deletions.
diff --git a/Makefile b/Makefile
@@ -10,6 +10,13 @@ build:
 	./scripts/shellcheck.sh
 	./scripts/build.sh
 
+test-debian:
+	docker run -it --network host --rm -w /working -v $$(pwd):/working -v /var/run/docker.sock:/var/run/docker.sock siakhooi/shed-tester:debian bash /working/test/in-container-init-test.sh
+test-ubuntu:
+	docker run -it --network host --rm -w /working -v $$(pwd):/working -v /var/run/docker.sock:/var/run/docker.sock siakhooi/shed-tester:ubuntu bash /working/test/in-container-init-test.sh
+
+## troubleshooting
+
 test-man:
 	pandoc src/md/shed-config.1.md -s -t man | man -l -
 #	pandoc src/md/shed-config.yaml.5.md -s -t man | man -l -
@@ -20,15 +27,11 @@ reinstall:
 
 build-debian:
 	cd test && docker build . -f Dockerfiles/Dockerfile_debian -t shed-tester:debian -t siakhooi/shed-tester:debian
-test-debian:
-	docker run -it --network host --rm -w /working -v $$(pwd):/working -v /var/run/docker.sock:/var/run/docker.sock siakhooi/shed-tester:debian bash /working/test/in-container-init-test.sh
 run-shed-debian:
 	docker run -it --network host --rm -w /working -v $$(pwd):/working -v /var/run/docker.sock:/var/run/docker.sock siakhooi/shed-tester:debian bash
 
 build-ubuntu:
 	cd test && docker build . -f Dockerfiles/Dockerfile_ubuntu -t shed-tester:ubuntu -t siakhooi/shed-tester:ubuntu
-test-ubuntu:
-	docker run -it --network host --rm -w /working -v $$(pwd):/working -v /var/run/docker.sock:/var/run/docker.sock siakhooi/shed-tester:ubuntu bash /working/test/in-container-init-test.sh
 run-shed-ubuntu:
 	docker run -it --network host --rm -w /working -v $$(pwd):/working -v /var/run/docker.sock:/var/run/docker.sock siakhooi/shed-tester:ubuntu bash
 

diff --git a/test/expected/shed-config/shed-config.out b/test/expected/shed-config/shed-config.out
@@ -1,15 +1,15 @@
-[36msheds[0m:
-  -[36m code[0m:[32m D[0m
-[32m    [0m[36mname[0m:[32m shed-D-development[0m
-[32m    [0m[36mkubeconfig[0m:
-      -[36m context[0m:[32m kube-dev-1[0m
-[32m        [0m[36mnamespace[0m:[32m ns-application[0m
-[32m        [0m[36mprompt-name[0m:[32m dev-app[0m
-[32m      [0m-[36m context[0m:[32m kube-dev-1[0m
-[32m        [0m[36mnamespace[0m:[32m ns-database[0m
-[32m  [0m-[36m code[0m:[32m T[0m
-[32m    [0m[36mname[0m:[32m shed-T-testing[0m
-[32m    [0m[36mkubeconfig[0m:
-      -[36m context[0m:[32m kube-test-1[0m
-[32m[0m[36mshed-init[0m:[36m[0m
-[36m  shed[0m:[32m D[0m
+sheds:
+  - code: D
+    name: shed-D-development
+    kubeconfig:
+      - context: kube-dev-1
+        namespace: ns-application
+        prompt-name: dev-app
+      - context: kube-dev-1
+        namespace: ns-database
+  - code: T
+    name: shed-T-testing
+    kubeconfig:
+      - context: kube-test-1
+shed-init:
+  shed: D
diff --git a/test/expected/shed-config/shed_config.out b/test/expected/shed-config/shed_config.out
@@ -1,15 +1,15 @@
-[36msheds[0m:
-  -[36m code[0m:[32m D[0m
-[32m    [0m[36mname[0m:[32m shed-D-development[0m
-[32m    [0m[36mkubeconfig[0m:
-      -[36m context[0m:[32m kube-dev-1[0m
-[32m        [0m[36mnamespace[0m:[32m ns-application[0m
-[32m        [0m[36mprompt-name[0m:[32m dev-app[0m
-[32m      [0m-[36m context[0m:[32m kube-dev-1[0m
-[32m        [0m[36mnamespace[0m:[32m ns-database[0m
-[32m  [0m-[36m code[0m:[32m T[0m
-[32m    [0m[36mname[0m:[32m shed-T-testing[0m
-[32m    [0m[36mkubeconfig[0m:
-      -[36m context[0m:[32m kube-test-1[0m
-[32m[0m[36mshed-init[0m:[36m[0m
-[36m  shed[0m:[32m D[0m
+sheds:
+  - code: D
+    name: shed-D-development
+    kubeconfig:
+      - context: kube-dev-1
+        namespace: ns-application
+        prompt-name: dev-app
+      - context: kube-dev-1
+        namespace: ns-database
+  - code: T
+    name: shed-T-testing
+    kubeconfig:
+      - context: kube-test-1
+shed-init:
+  shed: D