Fix some issues related with the test case power-management/lid_close…

…_suspend_open (bugfix) (canonical#1080)

- Include a note to ensure the test is executed at the appropriate time
- Fix the typo in the test order number
- Adjust the place of test case to avoid running it just after the suspend case

providers/base/units/graphics/test-plan.pxu

@@ -119,8 +119,6 @@ include:
     # depending on the amount of graphic cards available on the SUT:
     # suspend/suspend_advanced_auto (one GPU)
     # or suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto (two GPUs)
-    power-management/lid_close_suspend_open                  certification-status=blocker
-    power-management/lid                                     certification-status=blocker
     after-suspend-miscellanea/chvt
     suspend/1_display_after_suspend_.*_graphics              certification-status=blocker
     after-suspend-graphics/1_maximum_resolution_.*           certification-status=blocker
@@ -129,6 +127,8 @@ include:
     after-suspend-graphics/1_video_.*                        certification-status=blocker
     after-suspend-graphics/1_cycle_resolution_.*             certification-status=non-blocker
     suspend/1_xrandr_screens_after_suspend.tar.gz_auto
+    power-management/lid_close_suspend_open                  certification-status=blocker
+    power-management/lid                                     certification-status=blocker
 
 id: after-suspend-graphics-discrete-gpu-cert-full
 unit: test plan
@@ -205,15 +205,15 @@ _description: After suspend tests (integrated GPU, certification blockers only)
 include:
     after-suspend-graphics/1_auto_switch_card_.*           certification-status=blocker
     suspend/1_suspend_after_switch_to_card_.*_auto         certification-status=blocker
-    power-management/lid_close_suspend_open                certification-status=blocker
-    power-management/lid                                   certification-status=blocker
     suspend/1_gl_support_after_suspend_.*_auto             certification-status=blocker
     suspend/1_driver_version_after_suspend_.*_auto         certification-status=blocker
     suspend/1_resolution_after_suspend_.*_auto             certification-status=blocker
     suspend/1_display_after_suspend_.*_graphics            certification-status=blocker
     suspend/1_glxgears_after_suspend_.*_graphics           certification-status=blocker
     suspend/1_rotation_after_suspend_.*_graphics           certification-status=blocker 
     suspend/1_video_after_suspend_.*_graphics              certification-status=blocker
+    power-management/lid_close_suspend_open                certification-status=blocker
+    power-management/lid                                   certification-status=blocker
 
 id: after-suspend-graphics-discrete-gpu-cert-blockers
 unit: test plan

providers/base/units/power-management/jobs.pxu

@@ -161,10 +161,12 @@ requires: device.product == 'Lid Switch'
 _purpose:
     This test will check your lid sensor can detect lid close/open, and DUT will suspend when the lid closed
 _steps:
-    1. Press "Enter" to start the test
-    2. Close the lid (Please close the lid within 10 sec)
+    (Please wait at least 30 seconds after resuming from sleep before running this test. In most cases,
+     systemd will hold off on reacting to lid events in a period of time after system startup or resume.)
+    1. Press "Enter" to start the test.
+    2. Close the lid (Please close the lid within 10 sec).
     3. Wait 5 seconds with the lid closed.
-    5. Open the lid
+    4. Open the lid.
 _verification:
     Did the system suspend when lid closed, and resume back when the lid opened?
 command: