From 83f03a94f19d29fbe49c248f453dbf9e11a28ff8 Mon Sep 17 00:00:00 2001
From: Denis Pynkin <denis.pynkin@collabora.com>
Date: Tue, 4 Jun 2019 01:03:39 +0300
Subject: [PATCH] Revert "Downspeed the read from USB flash during AUM USB
 unplug test"

This reverts commit c86d18a72d60b22c7ff6c556a7d3595af31914b3.
The problem of low speed bandwidth is kernel crash (APERTIS-6016) which
completely blocking the USB unplug test.

With changes provided in previous commit we provide the binary diff
big enough to catch the proper timing by human and without kernel
crashes.

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>
---
 test-cases/apertis-update-manager-usb-unplug.yaml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/test-cases/apertis-update-manager-usb-unplug.yaml b/test-cases/apertis-update-manager-usb-unplug.yaml
index f0ee4ef..fd37cd2 100644
--- a/test-cases/apertis-update-manager-usb-unplug.yaml
+++ b/test-cases/apertis-update-manager-usb-unplug.yaml
@@ -48,10 +48,10 @@ run:
     - $ du -sh /usr/share/locale /usr/share/man /usr/share/zoneinfo
     - "Remove the initial deployment"
     - $ sudo ostree admin undeploy 1
-    - "Add udev rule for limiting the maximal read speed from USB drive to 64Kbps."
+    - "Add udev rule for limiting the maximal read speed from USB drive to 1MBps."
     - $ sudo tee /etc/udev/rules.d/99-usblimit.rules <<"EOF"
     - |
-        >KERNEL=="sd*", SUBSYSTEMS=="usb", ACTION=="add", ENV{DEVTYPE}=="disk", ENV{MAJOR}=="8", RUN+="/bin/sh -c 'echo $env{MAJOR}:$env{MINOR} 65536 > /sys/fs/cgroup/blkio/blkio.throttle.read_bps_device'"
+        >KERNEL=="sd*", SUBSYSTEMS=="usb", ACTION=="add", ENV{DEVTYPE}=="disk", ENV{MAJOR}=="8", RUN+="/bin/sh -c 'echo $env{MAJOR}:$env{MINOR} 1048576 > /sys/fs/cgroup/blkio/blkio.throttle.read_bps_device'"
         EOF
     - "Reboot the system"
     - "Check the current deployment"
@@ -60,12 +60,11 @@ run:
     - $ sudo journalctl -ef --unit apertis-update-manager &
     - "Plug the USB flash drive into the device"
     - "The update starts automatically"
-    - "Wait while the upgrade starts:"
+    - "Wait while the upgrade starts (5-20 seconds depending on your HW) and remove the USB flash drive before it is completed:"
     - |
         >Dec 19 22:31:46 apertis apertis-update-[390]: mount added : /media/test
         Dec 19 22:31:46 apertis apertis-update-[390]: Ostree static delta starting
         Dec 19 22:31:46 apertis apertis-update-[390]: Cannot check the ID in black list: No such file or directory
-    - "Wait for 5-20 seconds (depending on your HW) and remove the USB flash drive before it is completed."
     - "Update should be interrupted with error messages similar to"
     - |
         >[   59.542717] scsi 1:0:0:0: rejecting I/O to offline device
-- 
GitLab