From dd3a9f228d9f495067ee8d1d6e7d18c6071f1059 Mon Sep 17 00:00:00 2001 From: Sylvain Pineau Date: Tue, 8 Jan 2019 10:00:52 +0100 Subject: units:mediacard: leverage the checkbox-support utilities to run non-udisks2 tests on UC --- units/mediacard/jobs.pxu | 232 ++++++++++++++++++++++++++++++----------------- 1 file changed, 150 insertions(+), 82 deletions(-) diff --git a/units/mediacard/jobs.pxu b/units/mediacard/jobs.pxu index 7bbfded..01c0ad0 100644 --- a/units/mediacard/jobs.pxu +++ b/units/mediacard/jobs.pxu @@ -5,13 +5,12 @@ id: mediacard/mmc-insert estimated_duration: 30.0 command: {%- if __on_ubuntucore__ %} - timeout 20s bash -c 'grep -m 1 -oP "\Kadd.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!' + checkbox-support-run_watcher insertion mediacard {%- else %} removable_storage_watcher --memorycard insert sdio usb scsi {% endif -%} imports: from com.canonical.plainbox import manifest requires: - package.name == 'udisks2' or snap.name == 'udisks2' manifest.has_card_reader == 'True' user: root _description: @@ -27,15 +26,19 @@ _description: automatically selected result. plugin: shell +template-engine: jinja2 category_id: com.canonical.plainbox::mediacard id: mediacard/mmc-storage estimated_duration: 30.0 depends: mediacard/mmc-insert user: root -flags: preserve-cwd -command: removable_storage_test -s 67120000 --memorycard sdio usb scsi --auto-reduce-size -requires: - package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804) +flags: preserve-cwd reset-locale +command: + {%- if __on_ubuntucore__ %} + checkbox-support-usb_read_write + {%- else %} + removable_storage_test -s 67120000 --memorycard sdio usb scsi --auto-reduce-size + {% endif -%} _description: This test is automated and executes after the mediacard/mmc-insert test is run. It tests reading and writing to the MMC card. @@ -48,7 +51,7 @@ estimated_duration: 30.0 depends: mediacard/mmc-insert command: {%- if __on_ubuntucore__ %} - timeout 20s bash -c 'grep -m 1 -oP "\Kremove.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!' + checkbox-support-run_watcher removal mediacard {%- else %} removable_storage_watcher --memorycard remove sdio usb scsi {% endif -%} @@ -71,16 +74,15 @@ id: mediacard/sd-insert estimated_duration: 30.0 command: {%- if __on_ubuntucore__ %} - timeout 20s bash -c 'grep -m 1 -oP "\Kadd.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!' + checkbox-support-run_watcher insertion mediacard {%- else %} removable_storage_watcher --memorycard insert sdio usb scsi {% endif -%} imports: from com.canonical.plainbox import manifest requires: - package.name == 'udisks2' or snap.name == 'udisks2' manifest.has_card_reader == 'True' user: root -_summary: Test that insertion of an SD card is detected (udisks2) +_summary: Test that insertion of an SD card is detected _description: PURPOSE: This test will check that the systems media card reader can @@ -94,16 +96,20 @@ _description: automatically selected result. plugin: shell +template-engine: jinja2 category_id: com.canonical.plainbox::mediacard id: mediacard/sd-storage estimated_duration: 30.0 depends: mediacard/sd-insert user: root -flags: preserve-cwd -command: removable_storage_test -s 268400000 --memorycard sdio usb scsi -requires: - package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804) -_summary: Test reading & writing to a SD Card (udisks2) +flags: preserve-cwd reset-locale +command: + {%- if __on_ubuntucore__ %} + checkbox-support-usb_read_write + {%- else %} + removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size + {% endif -%} +_summary: Test reading & writing to a SD Card _description: This test is automated and executes after the mediacard/sd-insert test is run. It tests reading and writing to the SD card. @@ -116,7 +122,7 @@ estimated_duration: 30.0 depends: mediacard/sd-insert command: {%- if __on_ubuntucore__ %} - timeout 20s bash -c 'grep -m 1 -oP "\Kremove.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!' + checkbox-support-run_watcher removal mediacard {%- else %} removable_storage_watcher --memorycard remove sdio usb scsi {% endif -%} @@ -143,7 +149,6 @@ command: removable_storage_test -s 268400000 --memorycard -l sdio usb scsi && re imports: from com.canonical.plainbox import manifest requires: package.name == 'udisks2' or snap.name == 'udisks2' - package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804) manifest.has_card_reader == 'True' _summary: Automated test of SD Card reading & writing (udisk2) _description: @@ -158,16 +163,15 @@ id: mediacard/sdhc-insert estimated_duration: 30.0 command: {%- if __on_ubuntucore__ %} - timeout 20s bash -c 'grep -m 1 -oP "\Kadd.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!' + checkbox-support-run_watcher insertion mediacard {%- else %} removable_storage_watcher --memorycard insert sdio usb scsi {% endif -%} imports: from com.canonical.plainbox import manifest requires: - package.name == 'udisks2' or snap.name == 'udisks2' manifest.has_card_reader == 'True' user: root -_summary: Test that insertion of an SDHC card is detected (udisks2) +_summary: Test that insertion of an SDHC card is detected _description: PURPOSE: This test will check that the systems media card reader can @@ -182,16 +186,20 @@ _description: automatically selected result. plugin: shell +template-engine: jinja2 category_id: com.canonical.plainbox::mediacard id: mediacard/sdhc-storage estimated_duration: 30.0 depends: mediacard/sdhc-insert user: root -flags: preserve-cwd -command: removable_storage_test -s 268400000 --memorycard sdio usb scsi -requires: - package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804) -_summary: Test that insertion of an SDHC card is detected (udisks2) +flags: preserve-cwd reset-locale +command: + {%- if __on_ubuntucore__ %} + checkbox-support-usb_read_write + {%- else %} + removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size + {% endif -%} +_summary: Test that insertion of an SDHC card is detected _description: This test is automated and executes after the mediacard/sdhc-insert test is run. It tests reading and writing to the SDHC card. @@ -204,7 +212,7 @@ estimated_duration: 30.0 depends: mediacard/sdhc-insert command: {%- if __on_ubuntucore__ %} - timeout 20s bash -c 'grep -m 1 -oP "\Kremove.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!' + checkbox-support-run_watcher removal mediacard {%- else %} removable_storage_watcher --memorycard remove sdio usb scsi {% endif -%} @@ -228,13 +236,12 @@ id: mediacard/cf-insert estimated_duration: 30.0 command: {%- if __on_ubuntucore__ %} - timeout 20s bash -c 'grep -m 1 -oP "\Kadd.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!' + checkbox-support-run_watcher insertion mediacard {%- else %} removable_storage_watcher --memorycard insert sdio usb scsi {% endif -%} imports: from com.canonical.plainbox import manifest requires: - package.name == 'udisks2' or snap.name == 'udisks2' manifest.has_card_reader == 'True' user: root _description: @@ -250,14 +257,19 @@ _description: automatically selected result. plugin: shell +template-engine: jinja2 category_id: com.canonical.plainbox::mediacard id: mediacard/cf-storage estimated_duration: 30.0 depends: mediacard/cf-insert user: root -command: removable_storage_test -s 268400000 --memorycard sdio usb scsi -requires: - package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804) +flags: preserve-cwd reset-locale +command: + {%- if __on_ubuntucore__ %} + checkbox-support-usb_read_write + {%- else %} + removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size + {% endif -%} _description: This test is automated and executes after the mediacard/cf-insert test is run. It tests reading and writing to the CF card. @@ -270,7 +282,7 @@ depends: mediacard/cf-storage estimated_duration: 30.0 command: {%- if __on_ubuntucore__ %} - timeout 20s bash -c 'grep -m 1 -oP "\Kremove.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!' + checkbox-support-run_watcher removal mediacard {%- else %} removable_storage_watcher --memorycard remove sdio usb scsi {% endif -%} @@ -293,16 +305,15 @@ id: mediacard/sdxc-insert estimated_duration: 30.0 command: {%- if __on_ubuntucore__ %} - timeout 20s bash -c 'grep -m 1 -oP "\Kadd.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!' + checkbox-support-run_watcher insertion mediacard {%- else %} removable_storage_watcher --memorycard insert sdio usb scsi {% endif -%} imports: from com.canonical.plainbox import manifest requires: - package.name == 'udisks2' or snap.name == 'udisks2' manifest.has_card_reader == 'True' user: root -_summary: Test that insertion of an SDXC card is detected (udisks2) +_summary: Test that insertion of an SDXC card is detected _description: PURPOSE: This test will check that the systems media card reader can @@ -316,15 +327,20 @@ _description: automatically selected result. plugin: shell +template-engine: jinja2 category_id: com.canonical.plainbox::mediacard id: mediacard/sdxc-storage estimated_duration: 30.0 depends: mediacard/sdxc-insert user: root -command: removable_storage_test -s 268400000 --memorycard sdio usb scsi -requires: - package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804) -_summary: Test reading & writing to a SDXC Card (udisks2) +flags: preserve-cwd reset-locale +command: + {%- if __on_ubuntucore__ %} + checkbox-support-usb_read_write + {%- else %} + removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size + {% endif -%} +_summary: Test reading & writing to a SDXC Card _description: This test is automated and executes after the mediacard/sdxc-insert test is run. It tests reading and writing to the SDXC card. @@ -337,7 +353,7 @@ estimated_duration: 30.0 depends: mediacard/sdxc-insert command: {%- if __on_ubuntucore__ %} - timeout 20s bash -c 'grep -m 1 -oP "\Kremove.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!' + checkbox-support-run_watcher removal mediacard {%- else %} removable_storage_watcher --memorycard remove sdio usb scsi {% endif -%} @@ -361,13 +377,12 @@ id: mediacard/ms-insert estimated_duration: 30.0 command: {%- if __on_ubuntucore__ %} - timeout 20s bash -c 'grep -m 1 -oP "\Kadd.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!' + checkbox-support-run_watcher insertion mediacard {%- else %} removable_storage_watcher --memorycard insert sdio usb scsi {% endif -%} imports: from com.canonical.plainbox import manifest requires: - package.name == 'udisks2' or snap.name == 'udisks2' manifest.has_card_reader == 'True' user: root _description: @@ -383,14 +398,19 @@ _description: automatically selected result. plugin: shell +template-engine: jinja2 category_id: com.canonical.plainbox::mediacard id: mediacard/ms-storage estimated_duration: 30.0 depends: mediacard/ms-insert user: root -command: removable_storage_test -s 268400000 --memorycard sdio usb scsi -requires: - package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804) +flags: preserve-cwd reset-locale +command: + {%- if __on_ubuntucore__ %} + checkbox-support-usb_read_write + {%- else %} + removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size + {% endif -%} _description: This test is automated and executes after the mediacard/ms-insert test is run. It tests reading and writing to the MS card. @@ -403,7 +423,7 @@ estimated_duration: 30.0 depends: mediacard/ms-insert command: {%- if __on_ubuntucore__ %} - timeout 20s bash -c 'grep -m 1 -oP "\Kremove.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!' + checkbox-support-run_watcher removal mediacard {%- else %} removable_storage_watcher --memorycard remove sdio usb scsi {% endif -%} @@ -426,14 +446,13 @@ id: mediacard/msp-insert estimated_duration: 30.0 command: {%- if __on_ubuntucore__ %} - timeout 20s bash -c 'grep -m 1 -oP "\Kadd.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!' + checkbox-support-run_watcher insertion mediacard {%- else %} removable_storage_watcher --memorycard insert sdio usb scsi {% endif -%} user: root imports: from com.canonical.plainbox import manifest requires: - package.name == 'udisks2' or snap.name == 'udisks2' manifest.has_card_reader == 'True' _description: PURPOSE: @@ -448,14 +467,19 @@ _description: automatically selected result. plugin: shell +template-engine: jinja2 category_id: com.canonical.plainbox::mediacard id: mediacard/msp-storage estimated_duration: 30.0 depends: mediacard/msp-insert user: root -command: removable_storage_test -s 268400000 --memorycard sdio usb scsi -requires: - package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804) +flags: preserve-cwd reset-locale +command: + {%- if __on_ubuntucore__ %} + checkbox-support-usb_read_write + {%- else %} + removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size + {% endif -%} _description: This test is automated and executes after the mediacard/msp-insert test is run. It tests reading and writing to the MSP card. @@ -468,7 +492,7 @@ estimated_duration: 30.0 depends: mediacard/msp-insert command: {%- if __on_ubuntucore__ %} - timeout 20s bash -c 'grep -m 1 -oP "\Kremove.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!' + checkbox-support-run_watcher removal mediacard {%- else %} removable_storage_watcher --memorycard remove sdio usb scsi {% endif -%} @@ -491,13 +515,12 @@ id: mediacard/xd-insert estimated_duration: 30.0 command: {%- if __on_ubuntucore__ %} - timeout 20s bash -c 'grep -m 1 -oP "\Kadd.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!' + checkbox-support-run_watcher insertion mediacard {%- else %} removable_storage_watcher --memorycard insert sdio usb scsi {% endif -%} imports: from com.canonical.plainbox import manifest requires: - package.name == 'udisks2' or snap.name == 'udisks2' manifest.has_card_reader == 'True' user: root _description: @@ -513,14 +536,19 @@ _description: automatically selected result. plugin: shell +template-engine: jinja2 category_id: com.canonical.plainbox::mediacard id: mediacard/xd-storage estimated_duration: 30.0 depends: mediacard/xd-insert user: root -command: removable_storage_test -s 268400000 --memorycard sdio usb scsi -requires: - package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804) +flags: preserve-cwd reset-locale +command: + {%- if __on_ubuntucore__ %} + checkbox-support-usb_read_write + {%- else %} + removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size + {% endif -%} _description: This test is automated and executes after the mediacard/xd-insert test is run. It tests reading and writing to the xD card. @@ -533,7 +561,7 @@ estimated_duration: 30.0 depends: mediacard/xd-insert command: {%- if __on_ubuntucore__ %} - timeout 20s bash -c 'grep -m 1 -oP "\Kremove.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!' + checkbox-support-run_watcher removal mediacard {%- else %} removable_storage_watcher --memorycard remove sdio usb scsi {% endif -%} @@ -550,14 +578,19 @@ _description: automatically selected result. plugin: user-interact-verify +template-engine: jinja2 category_id: com.canonical.plainbox::mediacard id: mediacard/sd-performance-manual depends: mediacard/sd-insert estimated_duration: 120.0 user: root -command: removable_storage_test -s 268400000 --memorycard sdio usb | cat <(echo "Working...") - <(echo; echo "Verify the result and decide on the outcome") -requires: - package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804) +flags: preserve-cwd reset-locale +command: + {%- if __on_ubuntucore__ %} + checkbox-support-usb_read_write + {%- else %} + removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size + {% endif -%} environ: LD_LIBRARY_PATH GI_TYPELIB_PATH _description: PURPOSE: @@ -569,14 +602,19 @@ _description: Did the results of the test match the expected performance of the inserted device? plugin: user-interact-verify +template-engine: jinja2 category_id: com.canonical.plainbox::mediacard id: mediacard/sdhc-performance-manual depends: mediacard/sdhc-insert estimated_duration: 120.0 user: root -command: removable_storage_test -s 268400000 --memorycard sdio usb | cat <(echo "Working...") - <(echo; echo "Verify the result and decide on the outcome") -requires: - package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804) +flags: preserve-cwd reset-locale +command: + {%- if __on_ubuntucore__ %} + checkbox-support-usb_read_write + {%- else %} + removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size + {% endif -%} environ: LD_LIBRARY_PATH GI_TYPELIB_PATH _description: PURPOSE: @@ -588,14 +626,19 @@ _description: Did the results of the test match the expected performance of the inserted device? plugin: user-interact-verify +template-engine: jinja2 category_id: com.canonical.plainbox::mediacard id: mediacard/mmc-performance-manual depends: mediacard/mmc-insert estimated_duration: 120.0 user: root -command: removable_storage_test -s 209715200 --memorycard sdio usb | cat <(echo "Working...") - <(echo; echo "Verify the result and decide on the outcome") -requires: - package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804) +flags: preserve-cwd reset-locale +command: + {%- if __on_ubuntucore__ %} + checkbox-support-usb_read_write + {%- else %} + removable_storage_test -s 209715200 --memorycard sdio usb scsi --auto-reduce-size + {% endif -%} environ: LD_LIBRARY_PATH GI_TYPELIB_PATH _description: PURPOSE: @@ -607,14 +650,19 @@ _description: Did the results of the test match the expected performance of the inserted device? plugin: user-interact-verify +template-engine: jinja2 category_id: com.canonical.plainbox::mediacard id: mediacard/cf-performance-manual depends: mediacard/cf-insert estimated_duration: 120.0 user: root -command: removable_storage_test -s 268400000 --memorycard sdio usb | cat <(echo "Working...") - <(echo; echo "Verify the result and decide on the outcome") -requires: - package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804) +flags: preserve-cwd reset-locale +command: + {%- if __on_ubuntucore__ %} + checkbox-support-usb_read_write + {%- else %} + removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size + {% endif -%} environ: LD_LIBRARY_PATH GI_TYPELIB_PATH _description: PURPOSE: @@ -626,14 +674,19 @@ _description: Did the results of the test match the expected performance of the inserted device? plugin: user-interact-verify +template-engine: jinja2 category_id: com.canonical.plainbox::mediacard id: mediacard/sdxc-performance-manual depends: mediacard/sdxc-insert estimated_duration: 120.0 user: root -command: removable_storage_test -s 268400000 --memorycard sdio usb | cat <(echo "Working...") - <(echo; echo "Verify the result and decide on the outcome") -requires: - package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804) +flags: preserve-cwd reset-locale +command: + {%- if __on_ubuntucore__ %} + checkbox-support-usb_read_write + {%- else %} + removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size + {% endif -%} environ: LD_LIBRARY_PATH GI_TYPELIB_PATH _description: PURPOSE: @@ -645,14 +698,19 @@ _description: Did the results of the test match the expected performance of the inserted device? plugin: user-interact-verify +template-engine: jinja2 category_id: com.canonical.plainbox::mediacard id: mediacard/ms-performance-manual depends: mediacard/ms-insert estimated_duration: 120.0 user: root -command: removable_storage_test -s 268400000 --memorycard sdio usb | cat <(echo "Working...") - <(echo; echo "Verify the result and decide on the outcome") -requires: - package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804) +flags: preserve-cwd reset-locale +command: + {%- if __on_ubuntucore__ %} + checkbox-support-usb_read_write + {%- else %} + removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size + {% endif -%} environ: LD_LIBRARY_PATH GI_TYPELIB_PATH _description: PURPOSE: @@ -664,14 +722,19 @@ _description: Did the results of the test match the expected performance of the inserted device? plugin: user-interact-verify +template-engine: jinja2 category_id: com.canonical.plainbox::mediacard id: mediacard/msp-performance-manual depends: mediacard/msp-insert estimated_duration: 120.0 user: root -command: removable_storage_test -s 268400000 --memorycard sdio usb | cat <(echo "Working...") - <(echo; echo "Verify the result and decide on the outcome") -requires: - package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804) +flags: preserve-cwd reset-locale +command: + {%- if __on_ubuntucore__ %} + checkbox-support-usb_read_write + {%- else %} + removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size + {% endif -%} environ: LD_LIBRARY_PATH GI_TYPELIB_PATH _description: PURPOSE: @@ -683,14 +746,19 @@ _description: Did the results of the test match the expected performance of the inserted device? plugin: user-interact-verify +template-engine: jinja2 category_id: com.canonical.plainbox::mediacard id: mediacard/xd-performance-manual depends: mediacard/xd-insert estimated_duration: 120.0 user: root -command: removable_storage_test -s 268400000 --memorycard sdio usb | cat <(echo "Working...") - <(echo; echo "Verify the result and decide on the outcome") -requires: - package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804) +flags: preserve-cwd reset-locale +command: + {%- if __on_ubuntucore__ %} + checkbox-support-usb_read_write + {%- else %} + removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size + {% endif -%} environ: LD_LIBRARY_PATH GI_TYPELIB_PATH _description: PURPOSE: -- cgit v1.2.3