Tests: Relocate device-specific tests to their own folder

trilitech · Oct 19, 2023 · 1199b29 · 1199b29
1 parent c7ccf33
commit 1199b29
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -64,8 +64,6 @@ jobs:
       fail-fast: false
       matrix:
         device: [nanos, nanosp, nanox, stax]
-    env:
-      DEVICE_KIND: "${{ matrix.device }} === 'stax' ? 'stax' : 'nano'"
     container:
       image: ${{ needs.build_docker_integration_tests.outputs.image }}
       credentials:
@@ -91,8 +89,13 @@ jobs:
 
       - name: Run test
         run: |
-          ./tests/integration/run_test_local.sh -F -m ${{ matrix.device }} \
-            ./tests/integration/$DEVICE_KIND
+          if [ "${{ matrix.device }}" == "stax" ]; then
+            ./tests/integration/run_test_local.sh -F -m ${{ matrix.device }} \
+              ./tests/integration/${{ matrix.device }}
+          else
+            ./tests/integration/run_test_local.sh -F -m ${{ matrix.device }} \
+              ./tests/integration/nano ./tests/integration/${{ matrix.device }}
+          fi
 
       - name: Upload results
         uses: actions/upload-artifact@v3

diff --git a/Makefile b/Makefile
@@ -88,8 +88,9 @@ integration_tests_basic_stax:	app_stax.tgz			\
 integration_tests_basic_%:	app_%.tgz			\
 				app_%_dbg.tgz			\
 				tests/integration/*		\
-				tests/integration/nano/*
-	$(RUN_TEST_DOCKER) $* tests/integration/nano
+				tests/integration/nano/*	\
+				tests/integration/%/*
+	$(RUN_TEST_DOCKER) $* tests/integration/nano tests/integration/$*
 
 integration_tests_basic:	integration_tests_basic_nanos	\
 				integration_tests_basic_nanosp	\

diff --git a/...ntegration/nano/regression_batched_ops.sh → ...tegration/nanos/regression_batched_ops.sh b/...ntegration/nano/regression_batched_ops.sh → ...tegration/nanos/regression_batched_ops.sh
diff --git a/...nano/regression_potential_empty_screen.sh → ...nosp/regression_potential_empty_screen.sh b/...nano/regression_potential_empty_screen.sh → ...nosp/regression_potential_empty_screen.sh
diff --git a/...press_right_works_across_apdu_recieves.sh → ...press_right_works_across_apdu_recieves.sh b/...press_right_works_across_apdu_recieves.sh → ...press_right_works_across_apdu_recieves.sh
diff --git a/tests/integration/nanox/regression_batched_ops.sh b/tests/integration/nanox/regression_batched_ops.sh
@@ -0,0 +1,41 @@
+# Regression: second operation Entrypoint/Parameter not displayed
+
+# full input: 00000000000000000000000000000000000000000000000000000000000000006c001597c45b11b421bb806a0c56c5da5638bf4b1adbf0e617090006a09c010000bac799dfc7f6af2ff0b95f83d023e68c895020baffff086a65616e5f626f620000009a020000009507070200000000050800c6bab5ccc8d891cd8de4b6f7070707020000004b0704030b070702000000040505030b070705050a0000001503f01167865dc63dfee0e31251329ceab660d9460607070a000000150107b21fca96c5763f67b286752c7aaefc5931d15a030b050800a9df9fc1e7eaa7a9c1f7bd87a9ba9cadf5b5b2cd829deea2b7fef9070707020000000005050509030b6c01ee572f02e5be5d097ba17369789582882e8abb8790d627063202e0d403012b704944f5b5fd30eed2ab4385478488e09fe04a0000
+# signer: tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E
+start_speculos "$seed"
+expected_home
+send_async_apdus \
+        800f000011048000002c800006c18000000080000000 "expect_apdu_return 9000
+"\
+        800f0100eb0300000000000000000000000000000000000000000000000000000000000000006c001597c45b11b421bb806a0c56c5da5638bf4b1adbf0e617090006a09c010000bac799dfc7f6af2ff0b95f83d023e68c895020baffff086a65616e5f626f620000009a020000009507070200000000050800c6bab5ccc8d891cd8de4b6f7070707020000004b0704030b070702000000040505030b070705050a0000001503f01167865dc63dfee0e31251329ceab660d9460607070a000000150107b21fca96c5763f67b286752c7aaefc5931d15a030b050800a9df9fc1e7eaa7a9c1f7bd87a9ba9cadf5b5b2cd82 "expect_apdu_return 9000
+"\
+        800f82004a9deea2b7fef9070707020000000005050509030b6c01ee572f02e5be5d097ba17369789582882e8abb8790d627063202e0d403012b704944f5b5fd30eed2ab4385478488e09fe04a0000 "expect_apdu_return e3d5453110fb40a802b56b4af7f0d5370769b8154b0e6447357cbc54cc319ed4ff0b5c23a1a4ce3846ea35c135a3a5a4b8d3125c83a72a16f7a4fc0ffdc2306fbaead5a3559bf5974801055f505376bcd9abbe9bfec3d80f00c7161db0280e089000
+"
+expect_section_content 'Operation (0)' 'Transaction'
+press_button right
+expect_section_content 'Fee' '0.39 tz'
+press_button right
+expect_section_content 'Storage limit' '6'
+press_button right
+expect_section_content 'Amount' '0.02 tz'
+press_button right
+expect_section_content 'Destination' 'tz1cfdVKpBb9VRBdny8BQ5RSK82UudAp2miM'
+press_button right
+expect_section_content 'Entrypoint' 'jean_bob'
+press_button right
+expect_section_content 'Parameter' '{Pair {} (Right -76723569314251090535296646);Pair {Elt Unit (Pair {Left Unit} (Pair (Left 0x03F01167865DC63DFEE0E31251329CEAB660D94606) (Pair 0x0107B21FCA96C5763F67B286752C7AAEFC5931D15A Unit)))} (Right 3120123370638446806591421154959427514880865200209654970345);Pair {} (Left (Some Unit))}'
+press_button right
+expect_section_content 'Operation (1)' 'Transaction'
+press_button right
+expect_section_content 'Fee' '0.65 tz'
+press_button right
+expect_section_content 'Storage limit' '2'
+press_button right
+expect_section_content 'Amount' '0.06 tz'
+press_button right
+expect_section_content 'Destination' 'KT1CYT8oACUcCSNTu2qfgB4fj5bD7szYrpti'
+press_button right
+expected_accept
+press_button both
+expect_async_apdus_sent
+quit_app