diff options
| author | PMR <pmr@pmr-lander> | 2020-02-19 16:58:09 +0000 |
|---|---|---|
| committer | PMR <pmr@pmr-lander> | 2020-02-19 16:58:09 +0000 |
| commit | 70cc4c1ba879028fab337b9766c64883a764c02a (patch) | |
| tree | 19566c6e8d3d72d32fd1215940bcb1a2eca83ce2 | |
| parent | 9243421c7d11c646950b5b86e87b53d55bb37291 (diff) | |
| parent | 2fe069a9d32f011636ff7d277935f99bb9f7ebf8 (diff) | |
Merge #379460 from ~kissiel/plainbox-provider-checkbox:fix-raid-testing
| -rwxr-xr-x | bin/disk_read_performance_test | 2 | ||||
| -rwxr-xr-x | bin/storage_test.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/disk_read_performance_test b/bin/disk_read_performance_test index fec27c2c..8d6d6a05 100755 --- a/bin/disk_read_performance_test +++ b/bin/disk_read_performance_test @@ -49,7 +49,7 @@ for disk in $@; do "ide" ) MIN_BUF_READ=40;; "mmc" ) MIN_BUF_READ=$DEFAULT_BUF_READ;; "nvme" ) MIN_BUF_READ=200;; - "mdadm" ) MIN_BUF_READ=500;; + "mdadm" ) MIN_BUF_READ=80;; * ) MIN_BUF_READ=$DEFAULT_BUF_READ;; esac echo "INFO: $disk_type: Using $MIN_BUF_READ MB/sec as the minimum throughput speed" diff --git a/bin/storage_test.py b/bin/storage_test.py index 4f363bc9..1481a0dd 100755 --- a/bin/storage_test.py +++ b/bin/storage_test.py @@ -30,7 +30,7 @@ def find_largest_partition(device): out = sp.check_output(cmd, shell=True) blk_devs = [BlkDev(*p.strip().split()) for p in out.decode(sys.stdout.encoding).splitlines()] - blk_devs[:] = [bd for bd in blk_devs if bd.type == 'part'] + blk_devs[:] = [bd for bd in blk_devs if bd.type in ('part', 'md')] if not blk_devs: raise SystemExit( 'ERROR: No partitions found on device {}'.format(device)) |