Merge lp:~cypressyew/checkbox/fwts-generator-fix into lp:checkbox

Proposed by Po-Hsu Lin
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 4042
Merged at revision: 4043
Proposed branch: lp:~cypressyew/checkbox/fwts-generator-fix
Merge into: lp:checkbox
Diff against target: 57 lines (+7/-5)
2 files modified
providers/plainbox-provider-checkbox/bin/fwts_test (+5/-3)
providers/plainbox-provider-checkbox/jobs/firmware.txt.in (+2/-2)
To merge this branch: bzr merge lp:~cypressyew/checkbox/fwts-generator-fix
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Approve
Review via email: mp+273659@code.launchpad.net

Description of the change

* Move the uefirtvariable test from the QA test list to NON-CERT list, as we will have a dedicated one, so we won't test it again in the fwts_destop_diagnosis test.

* Move the out-of-list tests (wakealarm... etc) back to the NON-CERT list. This is essential for the generator, otherwise this job won't be generated as it can't be seem from fwts_test --list output
(BTW, we will still test the wakealarm test twice, in power-management/ and firmware/)

* Rename the fwts local job with generator_ prefix.

For the fix in test plan, I will paste the link to the bug later.

To post a comment you must log in.
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

+1a

review: Approve
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :
Download full text (5.4 KiB)

The attempt to merge lp:~cypressyew/checkbox/fwts-generator-fix into lp:checkbox failed. Below is the output from the failed tests.

[precise] starting container
[precise] (timing) 0.09user 0.08system 0:05.33elapsed 3%CPU (0avgtext+0avgdata 10200maxresident)k
[precise] (timing) 0inputs+32outputs (0major+8707minor)pagefaults 0swaps
[precise] provisioning container
[precise] (timing) 40.44user 10.63system 1:05.45elapsed 78%CPU (0avgtext+0avgdata 94880maxresident)k
[precise] (timing) 0inputs+19080outputs (0major+1590382minor)pagefaults 0swaps
[precise-testing] Starting tests...
Found a test script: ./checkbox-ng/requirements/container-tests-checkbox-ng-unit
[precise-testing] container-tests-checkbox-ng-unit: PASS
[precise-testing] (timing) 0.90user 0.19system 0:01.18elapsed 92%CPU (0avgtext+0avgdata 50420maxresident)k
[precise-testing] (timing) 0inputs+1976outputs (0major+27764minor)pagefaults 0swaps
Found a test script: ./checkbox-support/requirements/container-tests-checkbox-support
[precise-testing] container-tests-checkbox-support: PASS
[precise-testing] (timing) 25.12user 0.20system 0:25.35elapsed 99%CPU (0avgtext+0avgdata 150464maxresident)k
[precise-testing] (timing) 0inputs+1320outputs (0major+40387minor)pagefaults 0swaps
Found a test script: ./checkbox-touch/requirements/container-tests-touch-unit-tests
[precise-testing] container-tests-touch-unit-tests: PASS
[precise-testing] (timing) 0.01user 0.01system 0:00.03elapsed 77%CPU (0avgtext+0avgdata 2176maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+2485minor)pagefaults 0swaps
Found a test script: ./plainbox/plainbox/impl/providers/categories/requirements/container-tests-provider-categories
[precise-testing] container-tests-provider-categories: PASS
[precise-testing] (timing) 0.99user 0.08system 0:01.10elapsed 98%CPU (0avgtext+0avgdata 45820maxresident)k
[precise-testing] (timing) 0inputs+64outputs (0major+14259minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/001-container-tests-plainbox-egg-info
[precise-testing] 001-container-tests-plainbox-egg-info: PASS
[precise-testing] (timing) 0.22user 0.06system 0:00.29elapsed 96%CPU (0avgtext+0avgdata 14500maxresident)k
[precise-testing] (timing) 0inputs+96outputs (0major+6171minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox
[precise-testing] container-tests-plainbox: PASS
[precise-testing] (timing) 53.93user 1.40system 0:55.53elapsed 99%CPU (0avgtext+0avgdata 196548maxresident)k
[precise-testing] (timing) 0inputs+3256outputs (0major+199495minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-documentation
[precise-testing] container-tests-plainbox-documentation: PASS
[precise-testing] (timing) 149.84user 0.64system 2:30.76elapsed 99%CPU (0avgtext+0avgdata 176888maxresident)k
[precise-testing] (timing) 0inputs+39856outputs (0major+53681minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-integration
[precise-testing] container-tests-plainbox-integration: PASS
[precise-testing] ...

Read more...

Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :
Download full text (5.4 KiB)

The attempt to merge lp:~cypressyew/checkbox/fwts-generator-fix into lp:checkbox failed. Below is the output from the failed tests.

[precise] starting container
[precise] (timing) 0.08user 0.07system 0:05.31elapsed 3%CPU (0avgtext+0avgdata 10196maxresident)k
[precise] (timing) 0inputs+32outputs (0major+8743minor)pagefaults 0swaps
[precise] provisioning container
[precise] (timing) 41.17user 10.47system 0:59.68elapsed 86%CPU (0avgtext+0avgdata 94892maxresident)k
[precise] (timing) 0inputs+19072outputs (0major+1591357minor)pagefaults 0swaps
[precise-testing] Starting tests...
Found a test script: ./checkbox-ng/requirements/container-tests-checkbox-ng-unit
[precise-testing] container-tests-checkbox-ng-unit: PASS
[precise-testing] (timing) 0.93user 0.16system 0:01.19elapsed 92%CPU (0avgtext+0avgdata 50420maxresident)k
[precise-testing] (timing) 0inputs+1976outputs (0major+27764minor)pagefaults 0swaps
Found a test script: ./checkbox-support/requirements/container-tests-checkbox-support
[precise-testing] container-tests-checkbox-support: PASS
[precise-testing] (timing) 25.83user 0.25system 0:26.19elapsed 99%CPU (0avgtext+0avgdata 150468maxresident)k
[precise-testing] (timing) 0inputs+1320outputs (0major+40417minor)pagefaults 0swaps
Found a test script: ./checkbox-touch/requirements/container-tests-touch-unit-tests
[precise-testing] container-tests-touch-unit-tests: PASS
[precise-testing] (timing) 0.01user 0.01system 0:00.03elapsed 77%CPU (0avgtext+0avgdata 2176maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+2488minor)pagefaults 0swaps
Found a test script: ./plainbox/plainbox/impl/providers/categories/requirements/container-tests-provider-categories
[precise-testing] container-tests-provider-categories: PASS
[precise-testing] (timing) 1.01user 0.11system 0:01.13elapsed 98%CPU (0avgtext+0avgdata 45832maxresident)k
[precise-testing] (timing) 0inputs+64outputs (0major+14264minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/001-container-tests-plainbox-egg-info
[precise-testing] 001-container-tests-plainbox-egg-info: PASS
[precise-testing] (timing) 0.24user 0.04system 0:00.29elapsed 96%CPU (0avgtext+0avgdata 14500maxresident)k
[precise-testing] (timing) 0inputs+96outputs (0major+6170minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox
[precise-testing] container-tests-plainbox: PASS
[precise-testing] (timing) 53.11user 1.35system 0:54.63elapsed 99%CPU (0avgtext+0avgdata 196568maxresident)k
[precise-testing] (timing) 0inputs+3256outputs (0major+195897minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-documentation
[precise-testing] container-tests-plainbox-documentation: PASS
[precise-testing] (timing) 148.88user 0.58system 2:29.75elapsed 99%CPU (0avgtext+0avgdata 176860maxresident)k
[precise-testing] (timing) 0inputs+39856outputs (0major+53344minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-integration
[precise-testing] container-tests-plainbox-integration: PASS
[precise-testing] ...

Read more...

Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :
Download full text (5.4 KiB)

The attempt to merge lp:~cypressyew/checkbox/fwts-generator-fix into lp:checkbox failed. Below is the output from the failed tests.

[precise] starting container
[precise] (timing) 0.08user 0.07system 0:04.31elapsed 3%CPU (0avgtext+0avgdata 10200maxresident)k
[precise] (timing) 0inputs+32outputs (0major+8260minor)pagefaults 0swaps
[precise] provisioning container
[precise] (timing) 40.25user 10.52system 0:58.81elapsed 86%CPU (0avgtext+0avgdata 94848maxresident)k
[precise] (timing) 0inputs+19088outputs (0major+1591072minor)pagefaults 0swaps
[precise-testing] Starting tests...
Found a test script: ./checkbox-ng/requirements/container-tests-checkbox-ng-unit
[precise-testing] container-tests-checkbox-ng-unit: PASS
[precise-testing] (timing) 0.89user 0.20system 0:01.18elapsed 92%CPU (0avgtext+0avgdata 50420maxresident)k
[precise-testing] (timing) 0inputs+1976outputs (0major+27764minor)pagefaults 0swaps
Found a test script: ./checkbox-support/requirements/container-tests-checkbox-support
[precise-testing] container-tests-checkbox-support: PASS
[precise-testing] (timing) 25.23user 0.20system 0:25.47elapsed 99%CPU (0avgtext+0avgdata 150408maxresident)k
[precise-testing] (timing) 0inputs+1320outputs (0major+40418minor)pagefaults 0swaps
Found a test script: ./checkbox-touch/requirements/container-tests-touch-unit-tests
[precise-testing] container-tests-touch-unit-tests: PASS
[precise-testing] (timing) 0.01user 0.01system 0:00.03elapsed 78%CPU (0avgtext+0avgdata 2180maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+2487minor)pagefaults 0swaps
Found a test script: ./plainbox/plainbox/impl/providers/categories/requirements/container-tests-provider-categories
[precise-testing] container-tests-provider-categories: PASS
[precise-testing] (timing) 0.98user 0.12system 0:01.12elapsed 98%CPU (0avgtext+0avgdata 45828maxresident)k
[precise-testing] (timing) 0inputs+64outputs (0major+14262minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/001-container-tests-plainbox-egg-info
[precise-testing] 001-container-tests-plainbox-egg-info: PASS
[precise-testing] (timing) 0.23user 0.06system 0:00.30elapsed 96%CPU (0avgtext+0avgdata 14508maxresident)k
[precise-testing] (timing) 0inputs+96outputs (0major+6173minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox
[precise-testing] container-tests-plainbox: PASS
[precise-testing] (timing) 54.26user 1.41system 0:56.13elapsed 99%CPU (0avgtext+0avgdata 196580maxresident)k
[precise-testing] (timing) 0inputs+3256outputs (0major+199498minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-documentation
[precise-testing] container-tests-plainbox-documentation: PASS
[precise-testing] (timing) 150.89user 0.67system 2:32.11elapsed 99%CPU (0avgtext+0avgdata 176832maxresident)k
[precise-testing] (timing) 0inputs+39856outputs (0major+52827minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-integration
[precise-testing] container-tests-plainbox-integration: PASS
[precise-testing] ...

Read more...

Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :
Download full text (5.4 KiB)

The attempt to merge lp:~cypressyew/checkbox/fwts-generator-fix into lp:checkbox failed. Below is the output from the failed tests.

[precise] starting container
[precise] (timing) 0.08user 0.08system 0:04.31elapsed 3%CPU (0avgtext+0avgdata 10196maxresident)k
[precise] (timing) 0inputs+32outputs (0major+8231minor)pagefaults 0swaps
[precise] provisioning container
[precise] (timing) 40.46user 10.38system 1:05.05elapsed 78%CPU (0avgtext+0avgdata 94848maxresident)k
[precise] (timing) 0inputs+19088outputs (0major+1591268minor)pagefaults 0swaps
[precise-testing] Starting tests...
Found a test script: ./checkbox-ng/requirements/container-tests-checkbox-ng-unit
[precise-testing] container-tests-checkbox-ng-unit: PASS
[precise-testing] (timing) 0.94user 0.16system 0:01.21elapsed 91%CPU (0avgtext+0avgdata 50416maxresident)k
[precise-testing] (timing) 0inputs+1976outputs (0major+27783minor)pagefaults 0swaps
Found a test script: ./checkbox-support/requirements/container-tests-checkbox-support
[precise-testing] container-tests-checkbox-support: PASS
[precise-testing] (timing) 25.64user 0.19system 0:25.89elapsed 99%CPU (0avgtext+0avgdata 150400maxresident)k
[precise-testing] (timing) 0inputs+1320outputs (0major+39902minor)pagefaults 0swaps
Found a test script: ./checkbox-touch/requirements/container-tests-touch-unit-tests
[precise-testing] container-tests-touch-unit-tests: PASS
[precise-testing] (timing) 0.00user 0.02system 0:00.03elapsed 78%CPU (0avgtext+0avgdata 2184maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+2488minor)pagefaults 0swaps
Found a test script: ./plainbox/plainbox/impl/providers/categories/requirements/container-tests-provider-categories
[precise-testing] container-tests-provider-categories: PASS
[precise-testing] (timing) 1.02user 0.07system 0:01.11elapsed 98%CPU (0avgtext+0avgdata 45824maxresident)k
[precise-testing] (timing) 0inputs+64outputs (0major+14259minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/001-container-tests-plainbox-egg-info
[precise-testing] 001-container-tests-plainbox-egg-info: PASS
[precise-testing] (timing) 0.25user 0.03system 0:00.29elapsed 96%CPU (0avgtext+0avgdata 14504maxresident)k
[precise-testing] (timing) 0inputs+96outputs (0major+6170minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox
[precise-testing] container-tests-plainbox: PASS
[precise-testing] (timing) 54.76user 1.34system 0:56.28elapsed 99%CPU (0avgtext+0avgdata 196584maxresident)k
[precise-testing] (timing) 0inputs+3256outputs (0major+199526minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-documentation
[precise-testing] container-tests-plainbox-documentation: PASS
[precise-testing] (timing) 147.40user 0.78system 2:28.49elapsed 99%CPU (0avgtext+0avgdata 176900maxresident)k
[precise-testing] (timing) 0inputs+39856outputs (0major+53173minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-integration
[precise-testing] container-tests-plainbox-integration: PASS
[precise-testing] ...

Read more...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'providers/plainbox-provider-checkbox/bin/fwts_test'
--- providers/plainbox-provider-checkbox/bin/fwts_test 2015-09-01 09:45:56 +0000
+++ providers/plainbox-provider-checkbox/bin/fwts_test 2015-10-07 08:59:47 +0000
@@ -30,11 +30,11 @@
30 'mpcheck',30 'mpcheck',
31 'msr',31 'msr',
32 'nx',32 'nx',
33 'uefirtvariable',
34 'version']33 'version']
35# These are advanced tests that shouldn't affect certification status34# These are advanced tests that shouldn't affect certification status
36NON_CERT_TESTS = ['bios_info',35NON_CERT_TESTS = ['bios_info',
37 'cmosdump',36 'cmosdump',
37 'cpufreq',
38 'crs',38 'crs',
39 'crsdump',39 'crsdump',
40 'csm',40 'csm',
@@ -59,7 +59,9 @@
59 'uefidump',59 'uefidump',
60 'uefirtmisc',60 'uefirtmisc',
61 'uefirttime',61 'uefirttime',
62 'uefivarinfo'62 'uefirtvariable',
63 'uefivarinfo',
64 'wakealarm'
63 ]65 ]
64# The following tests will record logs in a separate file for the HWE team66# The following tests will record logs in a separate file for the HWE team
65HWE_TESTS = ['mtrr',67HWE_TESTS = ['mtrr',
@@ -295,7 +297,7 @@
295 elif args.test:297 elif args.test:
296 tests.extend(args.test)298 tests.extend(args.test)
297 elif args.all:299 elif args.all:
298 tests.extend(['wakealarm', 'cpufreq', 'maxfreq'] + TESTS)300 tests.extend(TESTS)
299 elif args.hwe:301 elif args.hwe:
300 tests.extend(HWE_TESTS)302 tests.extend(HWE_TESTS)
301 elif args.qa:303 elif args.qa:
302304
=== modified file 'providers/plainbox-provider-checkbox/jobs/firmware.txt.in'
--- providers/plainbox-provider-checkbox/jobs/firmware.txt.in 2015-09-08 22:04:46 +0000
+++ providers/plainbox-provider-checkbox/jobs/firmware.txt.in 2015-10-07 08:59:47 +0000
@@ -1,6 +1,6 @@
1plugin: local1plugin: local
2_summary: Automated tests for firmware using Firmware Test Suite.2_summary: Automated tests for firmware using Firmware Test Suite.
3id: firmware/fwts3id: firmware/generator_fwts
4estimated_duration: 0.54estimated_duration: 0.5
5requires: package.name == 'fwts'5requires: package.name == 'fwts'
6_description: Automated tests for firmware using Firmware Test Suite.6_description: Automated tests for firmware using Firmware Test Suite.
@@ -19,7 +19,7 @@
1919
20plugin: local20plugin: local
21_summary: Automated tests for firmware using Firmware Test Suite.21_summary: Automated tests for firmware using Firmware Test Suite.
22id: firmware/fwts_logs22id: firmware/generator_fwts_logs
23estimated_duration: 0.523estimated_duration: 0.5
24requires: package.name == 'fwts'24requires: package.name == 'fwts'
25_description: Automated tests for firmware using Firmware Test Suite.25_description: Automated tests for firmware using Firmware Test Suite.

Subscribers

People subscribed via source and target branches