Merge lp:~bladernr/checkbox/checkbox-fix-optical-tests into lp:checkbox

[Jeff Lane ]

fixed default.whitelist to use the correct optical test names.

[Jeff Lane  (bladernr)]

Also: removed suspend/bluetooth_before_suspend from whitelist as that test also no longer exists in checkbox but was left in default.whitelist

[lp:~bladernr/checkbox/checkbox-fix-optical-tests]

1054. By Jeff Lane  on 2011-09-20

found another minor issue with the default.whitelist. Removed suspend/bluetooth_before_suspend from the list as that test no longer exists.

[Daniel Manrique (roadmr)]

The name changes for the optical drive tests look good to me.

Regarding the suspend/bluetooth_before_suspend, it indeed no longer exists, but I notice suspend/bluetooth_detect_after_suspend remains, and as per its definition it will always fail, thus causing problems :(

What it does is compare the address of the bluetooth device to the one logged by the before_suspend test, obviously if the before_suspend one didn't run, the file won't exist and grep will complain.

So this test (suspend/bluetooth_detect_after_suspend) should at least be removed from the whitelist too.

I'm curious, why did we axe bluetooth_before_suspend in the first place? I remember fixing it not so long ago...

review: Needs Information

=== modified file 'data/whitelists/default.whitelist'
--- data/whitelists/default.whitelist	2011-09-19 15:51:51 +0000
+++ data/whitelists/default.whitelist	2011-09-20 16:11:25 +0000
@@ -93,9 +93,10 @@
 wireless/wireless_connection
 __optical__
 optical/detect
-optical/cdrom-read
+optical/read
+optical/read_sr0
+optical/read_sr1
 optical/cdrom-write
-optical/dvd-read
 optical/dvd-write
 __pcmcia-pcix__
 pcmcia-pcix/detect
@@ -105,7 +106,6 @@
 suspend/audio_after_suspend
 suspend/audio_before_suspend
 suspend/bluetooth_detect_after_suspend
-suspend/bluetooth_detect_before_suspend
 suspend/memory_before_suspend
 suspend/memory_after_suspend
 suspend/network_after_suspend