Merge lp:~bladernr/checkbox/1167214-test-files-too-big-mmc into lp:checkbox

Proposed by Jeff Lane 
Status: Merged
Approved by: Zygmunt Krynicki
Approved revision: 2034
Merged at revision: 2036
Proposed branch: lp:~bladernr/checkbox/1167214-test-files-too-big-mmc
Merge into: lp:checkbox
Diff against target: 33 lines (+3/-2)
2 files modified
debian/changelog (+1/-0)
jobs/mediacard.txt.in (+2/-2)
To merge this branch: bzr merge lp:~bladernr/checkbox/1167214-test-files-too-big-mmc
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Approve
Review via email: mp+158164@code.launchpad.net

Description of the change

reduce the size of generated test file for storage test to 64MB from 256MB for MMC card tests (mmc-storage and mmc-storage-after-suspend)

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

+1

we should really support syntax like 64M so that reviews don't have to include running python to multiply stuff

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-04-09 07:54:55 +0000
+++ debian/changelog 2013-04-10 16:30:28 +0000
@@ -12,6 +12,7 @@
12 12
13 [ Jeff Lane ]13 [ Jeff Lane ]
14 * jobs/info.txt.in: fixed bad driver name in audio_codecs job (LP: #1165215)14 * jobs/info.txt.in: fixed bad driver name in audio_codecs job (LP: #1165215)
15 * jobs/mediacard.txt.in: reduce test file size for MMC to 64MB (LP: #1167214)
1516
16 [ Jeff Marcom ]17 [ Jeff Marcom ]
17 * scripts/virtualization - Fixes issue where console terminal would 18 * scripts/virtualization - Fixes issue where console terminal would
1819
=== modified file 'jobs/mediacard.txt.in'
--- jobs/mediacard.txt.in 2013-03-07 07:46:10 +0000
+++ jobs/mediacard.txt.in 2013-04-10 16:30:28 +0000
@@ -17,7 +17,7 @@
17name: mediacard/mmc-storage17name: mediacard/mmc-storage
18depends: mediacard/mmc-insert18depends: mediacard/mmc-insert
19user: root19user: root
20command: removable_storage_test -s 268400000 --memorycard sdio usb scsi20command: removable_storage_test -s 67120000 --memorycard sdio usb scsi
21_description:21_description:
22 This test is automated and executes after the mediacard/mmc-insert22 This test is automated and executes after the mediacard/mmc-insert
23 test is run. It tests reading and writing to the MMC card.23 test is run. It tests reading and writing to the MMC card.
@@ -57,7 +57,7 @@
57name: mediacard/mmc-storage-after-suspend57name: mediacard/mmc-storage-after-suspend
58depends: mediacard/mmc-insert-after-suspend58depends: mediacard/mmc-insert-after-suspend
59user: root59user: root
60command: removable_storage_test -s 268400000 --memorycard sdio usb scsi60command: removable_storage_test -s 67120000 --memorycard sdio usb scsi
61_description:61_description:
62 This test is automated and executes after the mediacard/mmc-insert-after-suspend test62 This test is automated and executes after the mediacard/mmc-insert-after-suspend test
63 is run. It tests reading and writing to the MMC card after the system has been suspended.63 is run. It tests reading and writing to the MMC card after the system has been suspended.

Subscribers

People subscribed via source and target branches