From 74e7dc8aaeab503b25d16f7b831fe8bac33662d2 Mon Sep 17 00:00:00 2001 From: JW Date: Wed, 11 Aug 2021 13:05:29 +0200 Subject: [PATCH 1/5] update changelog link --- CHANGELOG.md | 2 +- ProgramDescription.md | 2 +- README.md | 2 +- testcases/testcases.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d890ad..1560546 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ **CalliopEO** -[README](README.md) | [Program Description](ProgramDescription.md) | [Testcases](testcases/testcases.md) | ***[CHANGELOG.md](CHANGELOG.md)*** +[README](README.md) | [Program Description](ProgramDescription.md) | [Testcases](testcases/testcases.md) | ***[Changelog](CHANGELOG.md)*** # Changelog All notable changes to this project will be documented in this file. diff --git a/ProgramDescription.md b/ProgramDescription.md index 42e63d9..c3f4b55 100644 --- a/ProgramDescription.md +++ b/ProgramDescription.md @@ -1,6 +1,6 @@ **CalliopEO** -[README](README.md) | ***[Program Description](ProgramDescription.md)*** | [Testcases](testcases/testcases.md) | [CHANGELOG.md](CHANGELOG.md) +[README](README.md) | ***[Program Description](ProgramDescription.md)*** | [Testcases](testcases/testcases.md) | [Changelog](CHANGELOG.md) # Program Description ## 1 Scope diff --git a/README.md b/README.md index 01f4cdf..9cdc483 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ **CalliopEO** -***[README](README.md)*** | [Program Description](ProgramDescription.md) | [Testcases](testcases/testcases.md) | [CHANGELOG.md](CHANGELOG.md) +***[README](README.md)*** | [Program Description](ProgramDescription.md) | [Testcases](testcases/testcases.md) | [Changelog](CHANGELOG.md) # Readme ## Description diff --git a/testcases/testcases.md b/testcases/testcases.md index 5b98236..07c7b80 100644 --- a/testcases/testcases.md +++ b/testcases/testcases.md @@ -1,6 +1,6 @@ **CalliopEO** -[README](../README.md) | [Program Description](../ProgramDescription.md) | ***[Testcases](ttestcases.md)*** | [CHANGELOG.md](../CHANGELOG.md) +[README](../README.md) | [Program Description](../ProgramDescription.md) | ***[Testcases](ttestcases.md)*** | [Changelog](../CHANGELOG.md) # Definition of Testcases This tables helps to structure the test cases. The list gives also the preferred order of test cases. From 3d4eefa250ee9e96be84c84afde88137ba9ef643 Mon Sep 17 00:00:00 2001 From: JW Date: Wed, 11 Aug 2021 13:06:52 +0200 Subject: [PATCH 2/5] Update program description chapter numbers --- ProgramDescription.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ProgramDescription.md b/ProgramDescription.md index c3f4b55..a20f7c0 100644 --- a/ProgramDescription.md +++ b/ProgramDescription.md @@ -116,19 +116,19 @@ The JavaScript file as an example can be found as an appendix (A.2). The Calliope mini presents itself as a USB disk when it is connected over USB and can be programmed through this interface. Furthermore, no matter what code you run on your Calliope mini you can always put a new program on using the USB connection. This is made possible by having a separate ‘interface chip’ on the Calliope mini dedicated to USB connections programming and debugging. The Interface MCU is a Freescale KL26Z. The chip that developers’ code runs on and that all the peripherals are connected to is called the ‘target MCU’. The Target MCU is a Nordic Semiconductor nRF51822. Due to the number of pins on the Nordic Semiconductor chip only the uart TX and RX lines are connected between the interface MCU and the target MCU. This means that there is no hardware flow control possible. This means that at higher serial speeds (baud rates above 9600) the Calliope mini may drop characters being sent to it. -#### Bootloader +#### 5.1.4 Bootloader The Calliope mini uses the default bootloader for the mini REV2 as available on [calliope.cc/en/start/tips](https://calliope.cc/en/start/tips). The Checksum for the file [jlink_ob_calliope_mini.hex](https://calliope.cc/media/pages/start/tipps/96fe22d2a5-1602240640/jlink_ob_calliope_mini.hex) is `441caf250939d9130c20a749936ae4df` -#### 5.1.4 Python Script +#### 5.1.5 Python Script The Python 3 script will run on the current Astro Pi hardware. However, the minimum dependencies are documented in [requirements.txt](requirements.txt). The installation, execution and de-installation process is documented in the [Readme.md](README.md) -### 5.1.5 The initial HEX file (30sec-iss-sensors.hex) +### 5.1.6 The initial HEX file (30sec-iss-sensors.hex) The initial HEX file provided with the upload of CalliopEO to the ISS is named `30sec-iss-sensors.hex`. The HEX file can be found in [./testcases/testfiles/](testcases/testfiles) and the source of the program can be found [here](testcases/testfiles/30sec-iss-sensors.js). The program is primarily meant to perform System Validation Tests to ensure propper functionality of hardware and software also remotely from Ground. From 002a30c68b41784a08227716cdab91aabb3a7177 Mon Sep 17 00:00:00 2001 From: Jan Grosser Date: Wed, 11 Aug 2021 21:10:57 +0200 Subject: [PATCH 3/5] Issue #78: End testing.sh if there are no testcase files in /testcases --- testing.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/testing.sh b/testing.sh index 6a55a36..6c89de3 100755 --- a/testing.sh +++ b/testing.sh @@ -41,6 +41,14 @@ if [[ ${tc_folder} == "" ]]; then tc_folder="./testcases" fi +# If there are no testcases files in ${tc_folder} exit with message +# See issue #78 +if [ $(ls -l ${tc_folder%/}/*.sh | wc -l) -eq 0 ]; then + message="No testcases found in ${tc_folder}." + whiptail --msgbox --title "CalliopEO Test" "${message}" 10 70 + exit 1 +fi + whiptail_args+=( --backtitle "CalliopEO Test" --title "Select Tests" @@ -50,12 +58,14 @@ whiptail_args+=( 26 80 16 ) +# Add testcase files as selection list to dialogue box i=0 for f in ${tc_folder%/}/*.sh do whiptail_args+=( "$((++i))" "${f##*/}" "on" ) done +# Show dialog box to let the user select the testcases selected=$(whiptail "${whiptail_args[@]}" 3>&1 1>&2 2>&3) # Exit if user selected "Cancel" From 268600ad901aced89aab7aa2fe6edebaa0a29f79 Mon Sep 17 00:00:00 2001 From: Jan Grosser Date: Wed, 11 Aug 2021 21:24:40 +0200 Subject: [PATCH 4/5] Updated CHANGELOG.MD --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1560546..20f7409 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Tracking changes in master **Updates** +- Closed issue #78: Testing.sh exits with notification if there are no testcase files +- Closed issue #76: Inserted "5 second sleep phase" between testcases with unconnected and connected CalliopEO in testing.sh to avoid that the program accesses CalliopEO too early which can result in errors +- Closed issue #74: Reduced data rate for burst.hex to avoid having corrupted .data files resulting in incorrect MD5 checksums +- Closed issue #48: Handle "unstructured" data from CalliopEO without newlines - Replaced md5sum by custom-made `comp()` function in testcases 07a and 07b - Removed unneeded declaration of `tc_folder` - Added Cancel button to GUI @@ -31,4 +35,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [1.0.0](https://github.com/calliope-edu/CalliopEO_AstroPi/releases/tag/v1.0.0) - 2021-07-24 -- Initial release \ No newline at end of file +- Initial release From a6e0b154cdc5f7f4cc3bca99eaae6477f7373e38 Mon Sep 17 00:00:00 2001 From: JW Date: Wed, 11 Aug 2021 23:14:30 +0200 Subject: [PATCH 5/5] Add testresults & update changelog --- CHANGELOG.md | 14 +- testresults/all_tests.txt | 666 ++++++------------- testresults/installation_and_systemcheck.txt | 41 +- 3 files changed, 232 insertions(+), 489 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 20f7409..969ff31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,19 +8,29 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## Tracking changes in master +*none yet* -## Tracking changes in master +## [1.1.0]() **Updates** - Closed issue #78: Testing.sh exits with notification if there are no testcase files - Closed issue #76: Inserted "5 second sleep phase" between testcases with unconnected and connected CalliopEO in testing.sh to avoid that the program accesses CalliopEO too early which can result in errors - Closed issue #74: Reduced data rate for burst.hex to avoid having corrupted .data files resulting in incorrect MD5 checksums - Closed issue #48: Handle "unstructured" data from CalliopEO without newlines +- Add testcase for data without newline +- Update Testresults +- Add error message output for `Max file size achieved` and `Max script time achieved` +- Add MIT Licence +- Do not add FLASH device in `/etc/fstab` in stup process anymore +- Updaters in `Readme` and `ProgramDescription` +- Update to initial Hex file `30s-iss-sensors.hex` - Replaced md5sum by custom-made `comp()` function in testcases 07a and 07b - Removed unneeded declaration of `tc_folder` - Added Cancel button to GUI -- Max no of retries to flash can now be configured via `MAX_RETRY_FLASHING` +- Max number of retries to flash can now be configured via `MAX_RETRY_FLASHING` +- Max serial line lenght read can now be configured via `MAX_LINE_LENGTH` - Cleaned up function `waitSerialStart()`, see issue #56 - Properly encode SERIAL_START before sending to serial port - Added notes on propper usage of `SERIAL_TIMEOUT` and `MAX_SERIAL_WAIT_REPLY` diff --git a/testresults/all_tests.txt b/testresults/all_tests.txt index 20f73f1..6abc1e7 100644 --- a/testresults/all_tests.txt +++ b/testresults/all_tests.txt @@ -1,7 +1,7 @@ calliope@astropiir:~/calliopEO $ ./testing.sh ################## TESTING CALLIOPEO.PY ################## -Test started: Wed 24 Feb 14:15:06 UTC 2021 -Selected Tests: "1" "2" "3" "4" "5" "6" "7" "8" "9" "10" "11" "12" "13" "14" +Test started: Wed 24 Feb 22:12:05 UTC 2021 +Selected Tests: "1" "2" "3" "4" "5" "6" "7" "8" "9" "10" "11" "12" "13" "14" "15" Start #1 ./testcases/01_collect-sysinfo.sh --------------------------------- @@ -109,27 +109,26 @@ Test: Single, nominal ZIP archive provided Unpacked /home/calliope/calliopEO/01.zip -programming: /home/calliope/calliopEO/run_20210224-141532/01.hex +programming: /home/calliope/calliopEO/run_20210224-221240/01.hex done open serial port Calliope Mini found on /dev/ttyACM0 .......... done reading data -Start @ 2021/02/24-14:15:49; Will stop @ 2021/02/24-17:20:49 +Start @ 2021/02/24-22:12:56; Will stop @ 2021/02/25-01:17:56 -Send @START@ +Sending @START@ Received @START@ -***** -5 lines read +****** done ############################################################################################################ Check 1/4: Return code of script is 0 ... PASSED Check 2/4: ZIP archive renamed to .done ... PASSED Check 3/4: Folder run_* created ... PASSED -Check 4/4: MD5 checksum in folder ./run_20210224-141532 ... PASSED +Check 4/4: MD5 checksum in folder ./run_20210224-221240 ... PASSED Testcase passed. --------------------------------- Finished #4 ./testcases/04_transmission-5s.sh @@ -144,37 +143,35 @@ Test: Provide two ZIP archive, the last one corrupted Unpacked /home/calliope/calliopEO/01.zip -programming: /home/calliope/calliopEO/run_20210224-141558/01.hex +programming: /home/calliope/calliopEO/run_20210224-221305/01.hex done open serial port Calliope Mini found on /dev/ttyACM0 .......... done reading data -Start @ 2021/02/24-14:16:14; Will stop @ 2021/02/24-17:21:14 +Start @ 2021/02/24-22:13:21; Will stop @ 2021/02/25-01:18:21 -Send @START@ +Sending @START@ Received @START@ -***** -5 lines read +****** done ############################################################################################################ -programming: /home/calliope/calliopEO/run_20210224-141558/02.hex +programming: /home/calliope/calliopEO/run_20210224-221305/02.hex done open serial port Calliope Mini found on /dev/ttyACM0 .......... done reading data -Start @ 2021/02/24-14:16:30; Will stop @ 2021/02/24-17:21:30 +Start @ 2021/02/24-22:13:37; Will stop @ 2021/02/25-01:18:37 -Send @START@ +Sending @START@ Received @START@ -***** -5 lines read +****** done ############################################################################################################ @@ -183,7 +180,7 @@ Check 2/6: ZIP archive renamed to .done ... PASSED Check 3/6: Folder run_* created ... PASSED Check 4/6: Created two .data files ... PASSED Check 5/6: The two .data files have same content ... PASSED -Check 6/6: MD5 checksum in folder ./run_20210224-141558 ... PASSED +Check 6/6: MD5 checksum in folder ./run_20210224-221305 ... PASSED Testcase passed. --------------------------------- Finished #5 ./testcases/05_corrupted_hex.sh @@ -217,37 +214,35 @@ Error while unpacking /home/calliope/calliopEO/02.zip: /home/calliope/calliopEO/ Unpacked /home/calliope/calliopEO/03.zip -programming: /home/calliope/calliopEO/run_20210224-141643/01.hex +programming: /home/calliope/calliopEO/run_20210224-221349/01.hex done open serial port Calliope Mini found on /dev/ttyACM0 .......... done reading data -Start @ 2021/02/24-14:17:00; Will stop @ 2021/02/24-17:22:00 +Start @ 2021/02/24-22:14:07; Will stop @ 2021/02/25-01:19:07 -Send @START@ +Sending @START@ Received @START@ -***** -5 lines read +****** done ############################################################################################################ -programming: /home/calliope/calliopEO/run_20210224-141643/02.hex +programming: /home/calliope/calliopEO/run_20210224-221349/02.hex done open serial port Calliope Mini found on /dev/ttyACM0 .......... done reading data -Start @ 2021/02/24-14:17:22; Will stop @ 2021/02/24-17:22:22 +Start @ 2021/02/24-22:14:28; Will stop @ 2021/02/25-01:19:28 -Send @START@ +Sending @START@ Received @START@ -***** -5 lines read +****** done ############################################################################################################ @@ -255,7 +250,7 @@ Check 1/5: Return code is 0 ... PASSED Check 2/5: ZIP archive renamed to .failed ... PASSED Check 3/5: Folder run_* created ... PASSED Check 4/5: Created two .data files ... PASSED -Check 5/5: MD5 checksum in folder ./run_20210224-141643 ... PASSED +Check 5/5: MD5 checksum in folder ./run_20210224-221349 ... PASSED Testcase passed. --------------------------------- Finished #7 ./testcases/06b_corrupted-zip.sh @@ -270,22 +265,21 @@ Test: Handle transmission timeout Unpacked /home/calliope/calliopEO/01.zip -programming: /home/calliope/calliopEO/run_20210224-141731/01.hex +programming: /home/calliope/calliopEO/run_20210224-221437/01.hex done open serial port Calliope Mini found on /dev/ttyACM0 .......... done reading data -Start @ 2021/02/24-14:17:47; Will stop @ 2021/02/24-14:18:22 +Start @ 2021/02/24-22:14:53; Will stop @ 2021/02/24-22:15:28 -Send @START@ +Sending @START@ Received @START@ ********************************** Max script time achieved -34 lines read done ############################################################################################################ @@ -293,7 +287,7 @@ Check 1/6: Return code is 0 ... PASSED Check 2/6: ZIP archive renamed to .done ... PASSED Check 3/6: Folder run_* created ... PASSED Check 4/6: Created two .data files ... PASSED -Check 5/6: MD5 checksum in folder ./run_20210224-141731 ... PASSED +Check 5/6: Check .data file in ./run_20210224-221437 ... PASSED Check 6/6: Transmission terminated in time ... PASSED Testcase passed. --------------------------------- @@ -309,39 +303,40 @@ Test: Continue with next hex after timeout Unpacked /home/calliope/calliopEO/01.zip -programming: /home/calliope/calliopEO/run_20210224-141825/01.hex +programming: /home/calliope/calliopEO/run_20210224-221532/01.hex done open serial port Calliope Mini found on /dev/ttyACM0 .......... done reading data -Start @ 2021/02/24-14:18:42; Will stop @ 2021/02/24-14:19:17 +Start @ 2021/02/24-22:15:48; Will stop @ 2021/02/24-22:16:23 +Start @ 2021/02/24-22:15:48; Will stop @ 2021/02/24-22:16:23 -Send @START@ +Sending @START@ Received @START@ ********************************** Max script time achieved -34 lines read done ############################################################################################################ -programming: /home/calliope/calliopEO/run_20210224-141825/02.hex +programming: /home/calliope/calliopEO/run_20210224-221532/02.hex done open serial port Calliope Mini found on /dev/ttyACM0 .......... done reading data -Start @ 2021/02/24-14:19:33; Will stop @ 2021/02/24-14:20:08 +Start @ 2021/02/24-22:16:39; Will stop @ 2021/02/24-22:17:14 -Send @START@ +Sending @START@ + +Sending @START@ Received @START@ -***** -5 lines read +****** done ############################################################################################################ @@ -349,7 +344,7 @@ Check 1/5: Return code is 0 ... PASSED Check 2/5: ZIP archive renamed to .done ... PASSED Check 3/5: Folder run_* created ... PASSED Check 4/5: Created two .data files ... PASSED -Check 5/5: MD5 checksum in folder ./run_20210224-141825 ... PASSED +Check 5/5: Check .data file in ./run_20210224-221532 ... PASSED Testcase passed. --------------------------------- Finished #9 ./testcases/07b_transm-timeout.sh @@ -364,22 +359,21 @@ Test: Handle data limit threshold Unpacked /home/calliope/calliopEO/01.zip -programming: /home/calliope/calliopEO/run_20210224-141942/01.hex +programming: /home/calliope/calliopEO/run_20210224-221649/01.hex done open serial port Calliope Mini found on /dev/ttyACM0 .......... done reading data -Start @ 2021/02/24-14:19:58; Will stop @ 2021/02/24-17:24:58 +Start @ 2021/02/24-22:17:06; Will stop @ 2021/02/25-01:22:06 -Send @START@ +Sending @START@ Received @START@ -****************************************************************************************************************************************************************************************************************** +******************************************************************************************************************************************************************************************************************* Max file size achieved -210 lines read done ############################################################################################################ @@ -387,7 +381,7 @@ Check 1/6: Return code is 0 ... PASSED Check 2/6: ZIP archive renamed to .done ... PASSED Check 3/6: Folder run_* created ... PASSED Check 4/6: Created two .data files ... PASSED -Check5/6: MD5 checksum in folder ./run_20210224-141942 ... PASSED +Check 5/6: MD5 checksum in folder ./run_20210224-221649 ... PASSED Check 6/6: First .data meets the size threshold (8000 bytes) ... PASSED Testcase passed. --------------------------------- @@ -403,39 +397,37 @@ Test: Handle data limit treshold Unpacked /home/calliope/calliopEO/01.zip -programming: /home/calliope/calliopEO/run_20210224-142003/01.hex +programming: /home/calliope/calliopEO/run_20210224-221729/01.hex done open serial port Calliope Mini found on /dev/ttyACM0 .......... done reading data -Start @ 2021/02/24-14:20:19; Will stop @ 2021/02/24-17:25:19 +Start @ 2021/02/24-22:17:45; Will stop @ 2021/02/25-01:22:45 -Send @START@ +Sending @START@ Received @START@ -****************************************************************************************************************************************************************************************************************** +******************************************************************************************************************************************************************************************************************* Max file size achieved -210 lines read done ############################################################################################################ -programming: /home/calliope/calliopEO/run_20210224-142003/02.hex +programming: /home/calliope/calliopEO/run_20210224-221729/02.hex done open serial port Calliope Mini found on /dev/ttyACM0 .......... done reading data -Start @ 2021/02/24-14:20:36; Will stop @ 2021/02/24-17:25:36 +Start @ 2021/02/24-22:18:22; Will stop @ 2021/02/25-01:23:22 -Send @START@ +Sending @START@ Received @START@ -***** -5 lines read +****** done ############################################################################################################ @@ -443,7 +435,7 @@ Check 1/6: Return code is 0 ... PASSED Check 2/6: ZIP archive renamed to .done ... PASSED Check 3/6: Folder run_* created ... PASSED Check 4/6: Created two .data files ... PASSED -Check 5/6: MD5 checksum in folder ./run_20210224-142003 ... PASSED +Check 5/6: MD5 checksum in folder ./run_20210224-221729 ... PASSED Check 6/6: First .data meets the size threshold (8000 bytes) ... PASSED Testcase passed. --------------------------------- @@ -459,255 +451,98 @@ Test: Hex File without sending @START@, but send other data. Unpacked /home/calliope/calliopEO/01.zip -programming: /home/calliope/calliopEO/run_20210224-142045/01.hex -done -open serial port -Calliope Mini found on /dev/ttyACM0 .......... -done -reading data - -Start @ 2021/02/24-14:21:01; Will stop @ 2021/02/24-17:26:01 - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ -Something went wrong retrying: 1/5 -programming: /home/calliope/calliopEO/run_20210224-142045/01.hex -done -open serial port -Calliope Mini found on /dev/ttyACM0 .......... -done -reading data - -Start @ 2021/02/24-14:21:18; Will stop @ 2021/02/24-17:26:18 - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ -Something went wrong retrying: 2/5 -programming: /home/calliope/calliopEO/run_20210224-142045/01.hex +programming: /home/calliope/calliopEO/run_20210224-221830/01.hex done open serial port Calliope Mini found on /dev/ttyACM0 .......... done reading data -Start @ 2021/02/24-14:21:55; Will stop @ 2021/02/24-17:26:55 - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ +Start @ 2021/02/24-22:18:47; Will stop @ 2021/02/25-01:23:47 -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ -Something went wrong retrying: 3/5 -programming: /home/calliope/calliopEO/run_20210224-142045/01.hex +Something went wrong. Retrying flashing (2/3) +programming: /home/calliope/calliopEO/run_20210224-221830/01.hex done open serial port Calliope Mini found on /dev/ttyACM0 .......... done reading data -Start @ 2021/02/24-14:22:31; Will stop @ 2021/02/24-17:27:31 - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ +Start @ 2021/02/24-22:19:13; Will stop @ 2021/02/25-01:24:13 -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ -Something went wrong retrying: 4/5 -programming: /home/calliope/calliopEO/run_20210224-142045/01.hex +Something went wrong. Retrying flashing (3/3) +programming: /home/calliope/calliopEO/run_20210224-221830/01.hex done open serial port Calliope Mini found on /dev/ttyACM0 .......... done reading data -Start @ 2021/02/24-14:23:07; Will stop @ 2021/02/24-17:28:07 +Start @ 2021/02/24-22:19:39; Will stop @ 2021/02/25-01:24:39 -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ -Something went wrong retrying: 5/5 +Sending @START@ Check 1/5: Return code of script is 0 ... PASSED Check 2/5: ZIP archive renamed to .done ... PASSED Check 3/5: Folder run_* created ... PASSED -Check 4/5: MD5 checksum in folder ./run_20210224-142045 ... PASSED +Check 4/5: MD5 checksum in folder ./run_20210224-221830 ... PASSED Check 5/5: Created no .data files ... PASSED Testcase passed. --------------------------------- @@ -723,272 +558,114 @@ Test: Hex File without sending @START@, but send other data. Unpacked /home/calliope/calliopEO/01.zip -programming: /home/calliope/calliopEO/run_20210224-142330/01.hex -done -open serial port -Calliope Mini found on /dev/ttyACM0 .......... -done -reading data - -Start @ 2021/02/24-14:23:47; Will stop @ 2021/02/24-17:28:47 - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ -Something went wrong retrying: 1/5 -programming: /home/calliope/calliopEO/run_20210224-142330/01.hex +programming: /home/calliope/calliopEO/run_20210224-221952/01.hex done open serial port Calliope Mini found on /dev/ttyACM0 .......... done reading data -Start @ 2021/02/24-14:24:23; Will stop @ 2021/02/24-17:29:23 - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ -Something went wrong retrying: 2/5 -programming: /home/calliope/calliopEO/run_20210224-142330/01.hex -done -open serial port -Calliope Mini found on /dev/ttyACM0 .......... -done -reading data - -Start @ 2021/02/24-14:24:59; Will stop @ 2021/02/24-17:29:59 - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ +Start @ 2021/02/24-22:20:08; Will stop @ 2021/02/25-01:25:08 -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ - -Send @START@ -Something went wrong retrying: 3/5 -programming: /home/calliope/calliopEO/run_20210224-142330/01.hex +Something went wrong. Retrying flashing (2/3) +programming: /home/calliope/calliopEO/run_20210224-221952/01.hex done open serial port Calliope Mini found on /dev/ttyACM0 .......... done reading data -Start @ 2021/02/24-14:25:35; Will stop @ 2021/02/24-17:30:35 - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ +Start @ 2021/02/24-22:20:35; Will stop @ 2021/02/25-01:25:35 -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ -Something went wrong retrying: 4/5 -programming: /home/calliope/calliopEO/run_20210224-142330/01.hex +Something went wrong. Retrying flashing (3/3) +programming: /home/calliope/calliopEO/run_20210224-221952/01.hex done open serial port Calliope Mini found on /dev/ttyACM0 .......... done reading data -Start @ 2021/02/24-14:26:11; Will stop @ 2021/02/24-17:31:11 - -Send @START@ - -Send @START@ +Start @ 2021/02/24-22:21:01; Will stop @ 2021/02/25-01:26:01 -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ +Sending @START@ -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ - -Send @START@ -Something went wrong retrying: 5/5 -programming: /home/calliope/calliopEO/run_20210224-142330/02.hex +Sending @START@ +programming: /home/calliope/calliopEO/run_20210224-221952/02.hex done open serial port Calliope Mini found on /dev/ttyACM0 .......... done reading data -Start @ 2021/02/24-14:26:28; Will stop @ 2021/02/24-17:31:28 +Start @ 2021/02/24-22:21:27; Will stop @ 2021/02/25-01:26:27 -Send @START@ +Sending @START@ Received @START@ -***** -5 lines read +****** done ############################################################################################################ Check 1/5: Return code of script is 0 ... PASSED Check 2/5: ZIP archive renamed to .done ... PASSED Check 3/5: Folder run_* created ... PASSED -Check 4/5: MD5 checksum in folder ./run_20210224-142330 ... PASSED +Check 4/5: MD5 checksum in folder ./run_20210224-221952 ... PASSED Check 5/5: Created one .data files ... PASSED Testcase passed. --------------------------------- @@ -1005,54 +682,51 @@ Unpacked /home/calliope/calliopEO/01.zip Unpacked /home/calliope/calliopEO/02.zip -programming: /home/calliope/calliopEO/run_20210224-142638/01.hex +programming: /home/calliope/calliopEO/run_20210224-222136/01.hex done open serial port Calliope Mini found on /dev/ttyACM0 .......... done reading data -Start @ 2021/02/24-14:26:54; Will stop @ 2021/02/24-17:31:54 +Start @ 2021/02/24-22:21:52; Will stop @ 2021/02/25-01:26:52 -Send @START@ +Sending @START@ Received @START@ -***** -5 lines read +****** done ############################################################################################################ -programming: /home/calliope/calliopEO/run_20210224-142638/02.hex +programming: /home/calliope/calliopEO/run_20210224-222136/02.hex done open serial port Calliope Mini found on /dev/ttyACM0 .......... done reading data -Start @ 2021/02/24-14:27:16; Will stop @ 2021/02/24-17:32:16 +Start @ 2021/02/24-22:22:14; Will stop @ 2021/02/25-01:27:14 -Send @START@ +Sending @START@ Received @START@ -***** -5 lines read +****** done ############################################################################################################ -programming: /home/calliope/calliopEO/run_20210224-142638/03.hex +programming: /home/calliope/calliopEO/run_20210224-222136/03.hex done open serial port Calliope Mini found on /dev/ttyACM0 .......... done reading data -Start @ 2021/02/24-14:27:38; Will stop @ 2021/02/24-17:32:38 +Start @ 2021/02/24-22:22:36; Will stop @ 2021/02/25-01:27:36 -Send @START@ +Sending @START@ Received @START@ -***** -5 lines read +****** done ############################################################################################################ @@ -1060,15 +734,51 @@ Check 1/5: Return code of script is 0 ... PASSED Check 2/5: ZIP archive renamed to .done ... PASSED Check 3/5: Folder run_* created ... PASSED Check 4/5: Created three .data files ... PASSED -Check 5/5: MD5 checksum in folder ./run_20210224-142638 ... PASSED +Check 5/5: MD5 checksum in folder ./run_20210224-222136 ... PASSED Testcase passed. --------------------------------- Finished #14 ./testcases/10_multi.sh +Start #15 ./testcases/11_no-crlf.sh +--------------------------------- +Test: Handle data without newline +--------------------------------- - Test ended: Wed 24 Feb 14:27:44 UTC 2021 +-=# CalliopEO #=- +Unpacked /home/calliope/calliopEO/01.zip - 14 FINISHED - 14 PASSED + +programming: /home/calliope/calliopEO/run_20210224-222243/01.hex +done +open serial port +Calliope Mini found on /dev/ttyACM0 .......... +done +reading data + +Start @ 2021/02/24-22:22:59; Will stop @ 2021/02/25-01:27:59 + +Sending @START@ + +Received @START@ +********************* +done +############################################################################################################ + +Check 1/6: Return code is 0 ... PASSED +Check 2/6: ZIP archive renamed to .done ... PASSED +Check 3/6: Folder run_* created ... PASSED +Check 4/6: Created .data files ... PASSED +Check 5/6: MD5 checksum in folder ./run_20210224-222243 ... PASSED +Testcase passed. +--------------------------------- +Finished #15 ./testcases/11_no-crlf.sh + + + + Test ended: Wed 24 Feb 22:23:12 UTC 2021 + + 15 FINISHED + 15 PASSED 0 NOT PASSED + diff --git a/testresults/installation_and_systemcheck.txt b/testresults/installation_and_systemcheck.txt index d55ffe4..f965466 100644 --- a/testresults/installation_and_systemcheck.txt +++ b/testresults/installation_and_systemcheck.txt @@ -1,11 +1,18 @@ -root@astropiir:~# cd /tmp/ -root@astropiir:/tmp# unzip CalliopEO_AstroPi-main.zip -Archive: CalliopEO_AstroPi-main.zip -0c2176f98d202df7e6009ab31d01e66af65acec6 +root@astropiir:~# cd /tmp +root@astropiir:/tmp# unzip CalliopEO_AstroPi-main\ \(7\).zip +Archive: CalliopEO_AstroPi-main (7).zip +c8411c08a47643fe2ea1314d44408cff0d74bb7e creating: CalliopEO_AstroPi-main/ inflating: CalliopEO_AstroPi-main/.gitignore + inflating: CalliopEO_AstroPi-main/CHANGELOG.md inflating: CalliopEO_AstroPi-main/CalliopEO.py + inflating: CalliopEO_AstroPi-main/LICENSE + inflating: CalliopEO_AstroPi-main/ProgramDescription.md inflating: CalliopEO_AstroPi-main/README.md + creating: CalliopEO_AstroPi-main/assets/ + inflating: CalliopEO_AstroPi-main/assets/select_testcases.png + inflating: CalliopEO_AstroPi-main/assets/software-flow.png + inflating: CalliopEO_AstroPi-main/assets/transmission.png creating: CalliopEO_AstroPi-main/modules/ inflating: CalliopEO_AstroPi-main/modules/argparse-1.4.0-py2.py3-none-any.whl inflating: CalliopEO_AstroPi-main/modules/blkinfo-0.1.2-py3-none-any.whl @@ -27,14 +34,25 @@ Archive: CalliopEO_AstroPi-main.zip inflating: CalliopEO_AstroPi-main/testcases/09a_transmission-no-start.sh inflating: CalliopEO_AstroPi-main/testcases/09b_transmission-no-start.sh inflating: CalliopEO_AstroPi-main/testcases/10_multi.sh + inflating: CalliopEO_AstroPi-main/testcases/11_no-crlf.sh + creating: CalliopEO_AstroPi-main/testcases/shfuncs/ + inflating: CalliopEO_AstroPi-main/testcases/shfuncs/comp.sh + inflating: CalliopEO_AstroPi-main/testcases/shfuncs/wait_for_calliope.sh inflating: CalliopEO_AstroPi-main/testcases/testcases.md creating: CalliopEO_AstroPi-main/testcases/testfiles/ inflating: CalliopEO_AstroPi-main/testcases/testfiles/05sec-counter.hex inflating: CalliopEO_AstroPi-main/testcases/testfiles/05sec-counter.hex.data inflating: CalliopEO_AstroPi-main/testcases/testfiles/05sec-counter.js + inflating: CalliopEO_AstroPi-main/testcases/testfiles/15sec-burst-no-crlf.hex + inflating: CalliopEO_AstroPi-main/testcases/testfiles/15sec-burst-no-crlf.hex.data + inflating: CalliopEO_AstroPi-main/testcases/testfiles/15sec-burst-no-crlf.js inflating: CalliopEO_AstroPi-main/testcases/testfiles/30sec-counter.hex inflating: CalliopEO_AstroPi-main/testcases/testfiles/30sec-counter.hex.data inflating: CalliopEO_AstroPi-main/testcases/testfiles/30sec-counter.js + inflating: CalliopEO_AstroPi-main/testcases/testfiles/30sec-iss-sensors.hex + inflating: CalliopEO_AstroPi-main/testcases/testfiles/30sec-iss-sensors.hex.data + inflating: CalliopEO_AstroPi-main/testcases/testfiles/30sec-iss-sensors.js + inflating: CalliopEO_AstroPi-main/testcases/testfiles/30sec-iss-sensors.zip inflating: CalliopEO_AstroPi-main/testcases/testfiles/900sec-counter.hex inflating: CalliopEO_AstroPi-main/testcases/testfiles/900sec-counter.hex.data.terminated35s inflating: CalliopEO_AstroPi-main/testcases/testfiles/burst.hex @@ -47,7 +65,8 @@ Archive: CalliopEO_AstroPi-main.zip inflating: CalliopEO_AstroPi-main/testing.conf inflating: CalliopEO_AstroPi-main/testing.sh creating: CalliopEO_AstroPi-main/testresults/ - inflating: CalliopEO_AstroPi-main/testresults/results.txt + inflating: CalliopEO_AstroPi-main/testresults/all_tests.txt + inflating: CalliopEO_AstroPi-main/testresults/installation_and_systemcheck.txt root@astropiir:/tmp# cd CalliopEO_AstroPi-main/ root@astropiir:/tmp/CalliopEO_AstroPi-main# ./setup.sh -=# SETUP #=- @@ -60,7 +79,7 @@ Calliope detected. UUID Flash: 089A-BCDE Copying files to /home/calliope/calliopEO Creating local mount points in /home/calliope/mnt/ -Adding mount point definitions to /etc/fstab +Adding mount point definition to /etc/fstab Installing Python modules Looking in indexes: https://pypi.org/simple, https://www.piwheels.org/simple Processing ./calliopEO/modules/argparse-1.4.0-py2.py3-none-any.whl @@ -78,10 +97,11 @@ Installing collected packages: pyserial Successfully installed pyserial-3.5 Finished! root@astropiir:/tmp/CalliopEO_AstroPi-main# su calliope -calliope@astropiir:/tmp/CalliopEO_AstroPi-main $ cd ~/calliopEO/ +calliope@astropiir:/tmp/CalliopEO_AstroPi-main $ cd +calliope@astropiir:~ $ cd ./calliopEO/ calliope@astropiir:~/calliopEO $ ./testing.sh ################## TESTING CALLIOPEO.PY ################## -Test started: Wed 24 Feb 22:47:09 UTC 2021 +Test started: Wed 24 Feb 22:11:16 UTC 2021 Selected Tests: "1" Start #1 ./testcases/01_collect-sysinfo.sh @@ -191,8 +211,11 @@ Skipped #13 ./testcases/09b_transmission-no-start.sh Skipped #14 ./testcases/10_multi.sh +Skipped #15 ./testcases/11_no-crlf.sh - Test ended: Wed 24 Feb 22:47:28 UTC 2021 + + + Test ended: Wed 24 Feb 22:11:25 UTC 2021 1 FINISHED 1 PASSED