summaryrefslogtreecommitdiff
path: root/debian/patches/0034-tests-imsm-Fix-unit-inconsistency-in-tests-error-mes.patch
diff options
context:
space:
mode:
authorDimitri John Ledkov <xnox@ubuntu.com>2018-07-23 11:41:17 +0100
committerDimitri John Ledkov <xnox@ubuntu.com>2018-07-23 11:41:17 +0100
commit3bed5265f9c792edfcd593eeaa93675711e5e264 (patch)
tree60fcbcc5048f276f07022b12d9b34245a6e8ae8d /debian/patches/0034-tests-imsm-Fix-unit-inconsistency-in-tests-error-mes.patch
parent9421e599c44cd50d3df4cd019cd3c53d9320e93d (diff)
Cherrypick master patches up to 20th of July 2018. LP: #1781427
Diffstat (limited to 'debian/patches/0034-tests-imsm-Fix-unit-inconsistency-in-tests-error-mes.patch')
-rw-r--r--debian/patches/0034-tests-imsm-Fix-unit-inconsistency-in-tests-error-mes.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/debian/patches/0034-tests-imsm-Fix-unit-inconsistency-in-tests-error-mes.patch b/debian/patches/0034-tests-imsm-Fix-unit-inconsistency-in-tests-error-mes.patch
new file mode 100644
index 00000000..db466cb2
--- /dev/null
+++ b/debian/patches/0034-tests-imsm-Fix-unit-inconsistency-in-tests-error-mes.patch
@@ -0,0 +1,31 @@
+From b202e322c13572078cc1285c41a8de23609e0820 Mon Sep 17 00:00:00 2001
+From: Michal Zylowski <michal.zylowski@intel.com>
+Date: Fri, 22 Jun 2018 16:34:08 +0200
+Subject: [PATCH 34/40] tests, imsm: Fix unit inconsistency in tests error
+ messages
+
+Chunk size copied from sysfs should be divied by 1024 to compare with
+expected chunk size.
+
+Signed-off-by: Michal Zylowski <michal.zylowski@intel.com>
+Signed-off-by: Jes Sorensen <jsorensen@fb.com>
+---
+ tests/env-imsm-template | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/env-imsm-template b/tests/env-imsm-template
+index ea45bae9..40479b48 100644
+--- a/tests/env-imsm-template
++++ b/tests/env-imsm-template
+@@ -30,7 +30,7 @@ imsm_check() {
+ fi
+ _chunk=`cat ${sysfs}/md/chunk_size`
+ if [ $t_chunk -ne $((_chunk/1024)) ]; then
+- echo "**Error**: Chunk size mismatch - expected $t_chunk, actual $_chunk" >&2
++ echo "**Error**: Chunk size mismatch - expected $t_chunk, actual $(($_chunk/1024))" >&2
+ err=$((err + 1))
+ fi
+ for i in `seq 0 $((t_num_disks - 1))`; do
+--
+2.17.1
+