Merge lp:~brendan-donegan/checkbox/bug1084601 into lp:checkbox

[Brendan Donegan]

This branch adds a couple of checks before running commands which depend on Bluetooth working. One is to check if the hardware is hard blocked and provide a warning - the subsequent attempt to test will fail. The second is to check if the hardware is soft blocked and again provide a warning, but this time try and unblock it. There is also a short delay after the unblock as most Bluetooth chips take a few seconds to reinitialise (running the test with no delay was exhibiting failures)

[Zygmunt Krynicki (zyga)]

10:24 < zyga> brendand: looking at your MP
10:24 < zyga> brendand: were you intending to fail the test if bluetooth is hard blocked?
10:25 < zyga> brendand: also, I have this feeling that the rate of repetition in that job warrants a small refactoring to a shell script
10:25 < brendand> zyga, hmm yeah, that's a fair point
10:26 < brendand> zyga, for the hard block, i'd rather just say it's hard block and then let it run and fail, which it probably will

review: Approve

[Zygmunt Krynicki (zyga)]

The attempt to merge lp:~brendan-donegan/checkbox/bug1084601 into lp:checkbox failed. Below is the output from the failed tests.

Running unittests...
[checkbox/lib/tests/test_resolver.py]
(tests=9, failures=0, errors=0)

[checkbox/parsers/tests/test_xinput.py]
(tests=8, failures=0, errors=0)

[checkbox/parsers/tests/test_dmidecode.py]
(tests=5, failures=0, errors=0)

[checkbox/parsers/tests/test_description.py]
(tests=14, failures=0, errors=0)

[checkbox/parsers/tests/test_efi.py]
(tests=3, failures=0, errors=0)

[checkbox/parsers/tests/test_dmi.py]
(tests=0, failures=0, errors=0)

[checkbox/parsers/tests/test_udevadm.py]
(tests=4, failures=0, errors=0)

[checkbox/parsers/tests/test_cputable.py]
(tests=2, failures=0, errors=0)

[checkbox/parsers/tests/test_submission.py]
(tests=10, failures=0, errors=0)

[checkbox/tests/test_message_files.py]
(tests=7, failures=0, errors=0)

[checkbox/tests/test_report.py]
(tests=4, failures=0, errors=0)

[checkbox/tests/test_setup_files.py]
(tests=3, failures=0, errors=0)

[checkbox/tests/test_job.py]
(tests=2, failures=0, errors=0)

[checkbox/heuristics/tests/test_udisks2.py]
(tests=1, failures=0, errors=0)

Running doctests...
[checkbox/parsers/tests/fixtures/xinput_quantal.txt]
(tests=0, failures=0, errors=0)

[checkbox/parsers/tests/fixtures/xinput_toshiba.txt]
(tests=0, failures=0, errors=0)

Total test cases: 72
Total doctests: 0
Total failures: 0
Total errors: 0
running test
running egg_info
creating plainbox.egg-info
writing requirements to plainbox.egg-info/requires.txt
writing plainbox.egg-info/PKG-INFO
writing top-level names to plainbox.egg-info/top_level.txt
writing dependency_links to plainbox.egg-info/dependency_links.txt
writing entry points to plainbox.egg-info/entry_points.txt
writing manifest file 'plainbox.egg-info/SOURCES.txt'
reading manifest file 'plainbox.egg-info/SOURCES.txt'
reading manifest template 'MANIFEST.in'
writing manifest file 'plainbox.egg-info/SOURCES.txt'
running build_ext

+ ./test
.........
----------------------------------------------------------------------
Ran 9 tests in 0.041s

OK
........
----------------------------------------------------------------------
Ran 8 tests in 0.177s

OK
.....
----------------------------------------------------------------------
Ran 5 tests in 0.050s

OK
..............
----------------------------------------------------------------------
Ran 14 tests in 0.053s

OK
...
----------------------------------------------------------------------
Ran 3 tests in 0.025s

OK

----------------------------------------------------------------------
Ran 0 tests in 0.000s

OK
....
----------------------------------------------------------------------
Ran 4 tests in 0.037s

OK
..
----------------------------------------------------------------------
Ran 2 tests in 0.008s

OK
..........
----------------------------------------------------------------------
Ran 10 tests in 3.043s

OK
.......
----------------------------------------------------------------------
Ran 7 tests in 82.222s

OK
....
----------------------------------------------------------------------
Ran 4 tests in 0.054s

OK
...
-----------------------------------------------------------...

[Zygmunt Krynicki (zyga)]

11:02 < zyga> brendand: I found a bug in your MP
11:02 < zyga> brendand: and something else that's wrong as well, digging deeper
11:13 < zyga> brendand: there's a bug in the shell code
11:13 < zyga> but shell is not parsed here so it should _not_ break
11:14 < zyga> brendand: the actual error is caused by parsing two job entries as one
11:14 < zyga> brendand: so all kinds of weird text gets interpreted as python expression
11:15 < zyga> brendand: this comes from
11:15 < zyga> Failed to parse resource program for job <JobDefinition name:'suspend/bluetooth_detect_after_suspend' plugin:'shell'> from <Origin
              filename:'/home/zyga/.cache/tarmac/branches/checkbox/trunk/jobs/suspend.txt.in' line_start:496 line_end:518>
11:15 < zyga> I'm trying to figure out exactly why this happens, the text looks fine to me
11:17 < zyga> ehhh
11:17 < zyga> ok
11:17 < zyga> I see it
11:17 < zyga> brendand: line 502 in suspend.txt.in
11:17 < zyga> brendand: remove the leading space
11:17 < zyga> brendand: and I'll get the extra debug features as a patch
11:18 < zyga> brendand: also you've missed echo in subsequent line in the shell

review: Needs Fixing

[Brendan Donegan (brendan-donegan)]

Addressed on line 502 and 514

review: Needs Resubmitting

[Zygmunt Krynicki (zyga)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Zygmunt Krynicki (zyga)]

+1

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-10 09:28:29 +0000
+++ debian/changelog	2013-01-14 10:51:21 +0000
@@ -1,7 +1,12 @@
 checkbox (0.15.1) raring; urgency=low
 
+  [ Daniel Manrique ]
   * Bumped revision number to 0.15.1 and restored previous trunk changelog.
 
+  [ Brendan Donegan ]
+  * jobs/bluetooth.txt.in, jobs/suspend.txt.in - unblock Bluetooth hardware
+    before running any Bluetooth tests to avoid these failing (LP: #1084601)
+
  -- Daniel Manrique <[e-mail]>  Wed, 09 Jan 2013 16:40:02 -0500
 
 checkbox (0.15) raring; urgency=low

=== modified file 'jobs/bluetooth.txt.in'
--- jobs/bluetooth.txt.in	2013-01-07 16:57:11 +0000
+++ jobs/bluetooth.txt.in	2013-01-14 10:51:21 +0000
@@ -4,7 +4,21 @@
 requires:
  package.name == 'bluez'
  device.category == 'BLUETOOTH'
-command: set -o pipefail; hcitool dev | tail -n+2 | awk '{print $2}' | tee $CHECKBOX_DATA/bluetooth_address
+command:
+ if rfkill list bluetooth | grep -q 'Hard blocked: yes'; then
+   echo "rfkill shows BT is hard blocked"
+ fi
+ if rfkill list bluetooth | grep -q 'Soft blocked: yes'; then
+   echo "rfkill shows BT is soft blocked, removing before testing"
+   rfkill unblock bluetooth
+   sleep 3
+ fi
+ output=$(hcitool dev | tail -n+2 | awk '{print $2}' | tee $CHECKBOX_DATA/bluetooth_address)
+ echo "$output"
+ if [ -z "$output" ]; then
+     "BT hardware not available"
+     exit 1
+ fi
 _description:
  Automated test to store bluetooth device information in checkbox report
 

=== modified file 'jobs/suspend.txt.in'
--- jobs/suspend.txt.in	2013-01-07 17:06:27 +0000
+++ jobs/suspend.txt.in	2013-01-14 10:51:21 +0000
@@ -47,9 +47,18 @@
   then
     echo "btdevaddr option not set to device address of Bluetooth target in checkbox.ini"
     exit 1
-  else
-    obex_send $BTDEVADDR $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg
-  fi
+  fi
+  if rfkill list bluetooth | grep -q 'Hard blocked: yes'
+  then
+    echo "rfkill shows BT is hard blocked"
+  fi
+  if rfkill list bluetooth | grep -q 'Soft blocked: yes'
+  then
+    echo "rfkill shows BT is soft blocked, removing before testing."
+    rfkill unblock bluetooth
+    sleep 3
+  fi
+  obex_send $BTDEVADDR $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg
 _description:
  This is an automated Bluetooth file transfer test. It sends an image to the device specified by the BTDEVADDR environment variable.
 
@@ -59,14 +68,22 @@
  package.name == 'bluez' and package.name == 'obexftp'
  device.category == 'BLUETOOTH'
 command:
-  set -o pipefail
   if [ -z "$BTDEVADDR" ]
   then
     echo "btdevaddr option not set to device address of Bluetooth target in checkbox.ini"
     exit 1
-  else
-    bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR send 2>&1 | ansi_parser
-  fi
+  fi
+  if rfkill list bluetooth | grep -q 'Hard blocked: yes'
+  then
+    echo "rfkill list shows BT is hard blocked"
+  fi
+  if rfkill list bluetooth | grep -q 'Soft blocked: yes'
+  then
+    echo "rfkill list shows BT is soft blocked, removing before testing"
+    rfkill unblock bluetooth
+    sleep 3
+  fi
+  set -o pipefail; bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR send 2>&1 | ansi_parser
 _description:
  This is an automated Bluetooth file transfer test. It sends an image to the device specified by the BTDEVADDR environment variable.
 
@@ -76,14 +93,22 @@
  package.name == 'bluez' and package.name == 'obexftp'
  device.category == 'BLUETOOTH'
 command:
-  set -o pipefail
   if [ -z "$BTDEVADDR" ]
   then
     echo "btdevaddr option not set to device address of Bluetooth target in checkbox.ini"
     exit 1
-  else
-    bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR browse 2>&1 | ansi_parser
-  fi
+  fi
+  if rfkill list bluetooth | grep -q 'Hard blocked: yes'
+  then
+    echo "rfkill list shows BT is hard blocked"
+  fi
+  if rfkill list bluetooth | grep -q 'Soft blocked: yes'
+  then
+    echo "rfkill list shows BT is soft blocked, removing before testing"
+    rfkill unblock bluetooth
+    sleep 3
+  fi
+  set -o pipefail; bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR browse 2>&1 | ansi_parser
 _description:
  This is an automated Bluetooth test. It emulates browsing on a remote device specified by the BTDEVADDR environment variable.
 
@@ -93,14 +118,22 @@
  package.name == 'bluez' and package.name == 'obexftp'
  device.category == 'BLUETOOTH'
 command:
-  set -o pipefail
   if [ -z "$BTDEVADDR" ]
   then
     echo "btdevaddr option not set to device address of Bluetooth target in checkbox.ini"
     exit 1
-  else
-    bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR get 2>&1 | ansi_parser
-  fi
+  fi
+  if rfkill list bluetooth | grep -q 'Hard blocked: yes'
+  then
+    echo "rfkill list shows BT is hard blocked"
+  fi
+  if rfkill list bluetooth | grep -q 'Soft blocked: yes'
+  then
+    echo "rfkill list shows BT is soft blocked, removing before testing"
+    rfkill unblock bluetooth
+    sleep 3
+  fi
+  set -o pipefail; bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR get 2>&1 | ansi_parser
 _description:
  This is an automated Bluetooth test. It receives the given file from a remote host specified by the BTDEVADDR environment variable
 
@@ -109,13 +142,14 @@
 requires:
  package.name == 'bluez' and package.name == 'obexd-client'
  device.category == 'BLUETOOTH'
-command: obex_send `bluetooth_scan` $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg
+command: rfkill unblock bluetooth; obex_send `bluetooth_scan` $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg
 _description:
  PURPOSE:
      This test will send the image 'JPEG_Color_Image_Ubuntu.jpg' to a specified device
  STEPS:
-     1. Click "Test" and you will be prompted to enter the Bluetooth device name of a device that can accept file transfers (It may take a few moments after entering the name for the file to begin sending)
-     2. Accept any prompts that appear on both devices
+     1. Make sure Bluetooth is enabled by checking the Bluetooth indicator applet
+     2. Click "Test" and you will be prompted to enter the Bluetooth device name of a device that can accept file transfers (It may take a few moments after entering the name for the file to begin sending)
+     3. Accept any prompts that appear on both devices
  VERIFICATION:
      Was the data correctly transferred?
 
@@ -465,7 +499,21 @@
 requires:
  package.name == 'bluez'
  device.category == 'BLUETOOTH'
-command: hcitool dev | tail -n+2 | awk '{print $2}' |diff $CHECKBOX_DATA/bluetooth_address -
+command:
+ if rfkill list bluetooth | grep -q 'Hard blocked: yes'; then
+   echo "rfkill shows BT is hard blocked"
+ fi
+ if rfkill list bluetooth | grep -q 'Soft blocked: yes'; then
+   echo "rfkill shows BT is soft blocked, removing before testing"
+   rfkill unblock bluetooth
+   sleep 3
+ fi
+ output=$(hcitool dev | tail -n+2 | awk '{print $2}')
+ echo $output | diff $CHECKBOX_DATA/bluetooth_address -
+ if [ -z "$output" ]; then
+     echo "BT hardware not available"
+     exit 1
+ fi
 _description:
  This test grabs the hardware address of the bluetooth adapter after suspend and compares it to the address grabbed before suspend.
 
@@ -480,9 +528,18 @@
   then
     echo "btdevaddr option not set to device address of Bluetooth target in checkbox.ini"
     exit 1
-  else
-    obex_send $BTDEVADDR $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg
-  fi
+  fi
+  if rfkill list bluetooth | grep -q 'Hard blocked: yes'
+  then
+    echo "rfkill shows BT is hard blocked"
+  fi
+  if rfkill list bluetooth | grep -q 'Soft blocked: yes'
+  then
+    echo "rfkill shows BT is soft blocked, removing before testing."
+    rfkill unblock bluetooth
+    sleep 3
+  fi
+  obex_send $BTDEVADDR $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg
 _description:
  This is an automated Bluetooth file transfer test. It sends an image to the device specified by the BTDEVADDR environment variable.
 
@@ -497,9 +554,18 @@
   then
     echo "btdevaddr option not set to device address of Bluetooth target in checkbox.ini"
     exit 1
-  else
-    obex_send $BTDEVADDR $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg
-  fi
+  fi
+  if rfkill list bluetooth | grep -q 'Hard blocked: yes'
+  then
+    echo "rfkill shows BT is hard blocked"
+  fi
+  if rfkill list bluetooth | grep -q 'Soft blocked: yes'
+  then
+    echo "rfkill shows BT is soft blocked, removing before testing."
+    rfkill unblock bluetooth
+    sleep 3
+  fi
+  obex_send $BTDEVADDR $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg
 _description:
  This is an automated Bluetooth file transfer test. It sends an image to the device specified by the BTDEVADDR environment variable.
 
@@ -510,14 +576,22 @@
  package.name == 'bluez' and package.name == 'obexftp'
  device.category == 'BLUETOOTH'
 command:
-  set -o pipefail
   if [ -z "$BTDEVADDR" ]
   then
     echo "btdevaddr option not set to device address of Bluetooth target in checkbox.ini"
     exit 1
-  else
-    bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR send 2>&1 | ansi_parser
-  fi
+  fi
+  if rfkill list bluetooth | grep -q 'Hard blocked: yes'
+  then
+    echo "rfkill list shows BT is hard blocked"
+  fi
+  if rfkill list bluetooth | grep -q 'Soft blocked: yes'
+  then
+    echo "rfkill list shows BT is soft blocked, removing before testing"
+    rfkill unblock bluetooth
+    sleep 3
+  fi
+  set -o pipefail; bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR send 2>&1 | ansi_parser
 _description:
  This is an automated Bluetooth file transfer test. It sends an image to the device specified by the BTDEVADDR environment variable.
 
@@ -528,14 +602,22 @@
  package.name == 'bluez' and package.name == 'obexftp'
  device.category == 'BLUETOOTH'
 command:
-  set -o pipefail
   if [ -z "$BTDEVADDR" ]
   then
     echo "btdevaddr option not set to device address of Bluetooth target in checkbox.ini"
     exit 1
-  else
-    bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR send 2>&1 | ansi_parser
-  fi
+  fi
+  if rfkill list bluetooth | grep -q 'Hard blocked: yes'
+  then
+    echo "rfkill list shows BT is hard blocked"
+  fi
+  if rfkill list bluetooth | grep -q 'Soft blocked: yes'
+  then
+    echo "rfkill list shows BT is soft blocked, removing before testing"
+    rfkill unblock bluetooth
+    sleep 3
+  fi
+  set -o pipefail; bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR send 2>&1 | ansi_parser
 _description:
  This is an automated Bluetooth file transfer test. It sends an image to the device specified by the BTDEVADDR environment variable.
 
@@ -546,14 +628,22 @@
  package.name == 'bluez' and package.name == 'obexftp'
  device.category == 'BLUETOOTH'
 command:
-  set -o pipefail
   if [ -z "$BTDEVADDR" ]
   then
     echo "btdevaddr option not set to device address of Bluetooth target in checkbox.ini"
     exit 1
-  else
-    bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR browse 2>&1 | ansi_parser
-  fi
+  fi
+  if rfkill list bluetooth | grep -q 'Hard blocked: yes'
+  then
+    echo "rfkill list shows BT is hard blocked"
+  fi
+  if rfkill list bluetooth | grep -q 'Soft blocked: yes'
+  then
+    echo "rfkill list shows BT is soft blocked, removing before testing"
+    rfkill unblock bluetooth
+    sleep 3
+  fi
+  set -o pipefail; bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR browse 2>&1 | ansi_parser
 _description:
  This is an automated Bluetooth test. It emulates browsing on a remote device specified by the BTDEVADDR environment variable.
 
@@ -564,14 +654,22 @@
  package.name == 'bluez' and package.name == 'obexftp'
  device.category == 'BLUETOOTH'
 command:
-  set -o pipefail
   if [ -z "$BTDEVADDR" ]
   then
     echo "btdevaddr option not set to device address of Bluetooth target in checkbox.ini"
     exit 1
-  else
-    bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR browse 2>&1 | ansi_parser
-  fi
+  fi
+  if rfkill list bluetooth | grep -q 'Hard blocked: yes'
+  then
+    echo "rfkill list shows BT is hard blocked"
+  fi
+  if rfkill list bluetooth | grep -q 'Soft blocked: yes'
+  then
+    echo "rfkill list shows BT is soft blocked, removing before testing"
+    rfkill unblock bluetooth
+    sleep 3
+  fi
+  set -o pipefail; bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR browse 2>&1 | ansi_parser
 _description:
  This is an automated Bluetooth test. It emulates browsing on a remote device specified by the BTDEVADDR environment variable.
 
@@ -582,14 +680,22 @@
  package.name == 'bluez' and package.name == 'obexftp'
  device.category == 'BLUETOOTH'
 command:
-  set -o pipefail
   if [ -z "$BTDEVADDR" ]
   then
     echo "btdevaddr option not set to device address of Bluetooth target in checkbox.ini"
     exit 1
-  else
-    bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR get 2>&1 | ansi_parser
-  fi
+  fi
+  if rfkill list bluetooth | grep -q 'Hard blocked: yes'
+  then
+    echo "rfkill list shows BT is hard blocked"
+  fi
+  if rfkill list bluetooth | grep -q 'Soft blocked: yes'
+  then
+    echo "rfkill list shows BT is soft blocked, removing before testing"
+    rfkill unblock bluetooth
+    sleep 3
+  fi
+  set -o pipefail; bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR get 2>&1 | ansi_parser
 _description:
  This is an automated Bluetooth test. It receives the given file from a remote host specified by the BTDEVADDR environment variable
 
@@ -600,14 +706,22 @@
  package.name == 'bluez' and package.name == 'obexftp'
  device.category == 'BLUETOOTH'
 command:
-  set -o pipefail
   if [ -z "$BTDEVADDR" ]
   then
     echo "btdevaddr option not set to device address of Bluetooth target in checkbox.ini"
     exit 1
-  else
-    bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR get 2>&1 | ansi_parser
-  fi
+  fi
+  if rfkill list bluetooth | grep -q 'Hard blocked: yes'
+  then
+    echo "rfkill list shows BT is hard blocked"
+  fi
+  if rfkill list bluetooth | grep -q 'Soft blocked: yes'
+  then
+    echo "rfkill list shows BT is soft blocked, removing before testing"
+    rfkill unblock bluetooth
+    sleep 3
+  fi
+  set -o pipefail; bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR get 2>&1 | ansi_parser
 _description:
  This is an automated Bluetooth test. It receives the given file from a remote host specified by the BTDEVADDR environment variable
 
@@ -617,7 +731,7 @@
 requires:
  package.name == 'bluez' and package.name == 'obexd-client'
  device.category == 'BLUETOOTH'
-command: obex_send `bluetooth_scan` $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg
+command: rfkill unblock bluetooth; obex_send `bluetooth_scan` $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg
 _description:
  PURPOSE:
      This test will send the image 'JPEG_Color_Image_Ubuntu.jpg' to a specified device