Bootstrap job for zapper-enabled test plan (New) (#1352)

* Add: zapper reset bootstrap job

* Fix: removed deprecated zapper-enabled job

checkbox-support/checkbox_support/scripts/tests/test_zapper_proxy.py

@@ -112,7 +112,7 @@ def test_get_capabilities_one_cap(self, import_mock):
 
         with patch("builtins.print") as mocked_print:
             get_capabilities("0.0.0.0")
-            mocked_print.assert_called_once_with("foo: bar")
+            mocked_print.assert_called_once_with("foo: bar\n\navailable: True")
 
     @patch("checkbox_support.scripts.zapper_proxy.import_module")
     def test_get_capabilities_error(self, import_mock):
@@ -126,7 +126,7 @@ def test_get_capabilities_error(self, import_mock):
 
         with patch("builtins.print") as mocked_print:
             get_capabilities("0.0.0.0")
-            mocked_print.assert_called_once_with("")
+            mocked_print.assert_called_once_with("available: False")
 
     @patch("checkbox_support.scripts.zapper_proxy.import_module")
     def test_get_capabilities_empty(self, import_mock):
@@ -137,7 +137,7 @@ def test_get_capabilities_empty(self, import_mock):
         self._mocked_conn.root.get_capabilities = Mock(return_value=ret_val)
         with patch("builtins.print") as mocked_print:
             get_capabilities("0.0.0.0")
-            mocked_print.assert_called_once_with("")
+            mocked_print.assert_called_once_with("available: True")
 
     @patch("checkbox_support.scripts.zapper_proxy.import_module")
     def test_get_capabilities_multiple_caps(self, import_mock):
@@ -154,7 +154,9 @@ def test_get_capabilities_multiple_caps(self, import_mock):
 
         with patch("builtins.print") as mocked_print:
             get_capabilities("0.0.0.0")
-            mocked_print.assert_called_once_with("foo: bar\n\nbaz: biz")
+            mocked_print.assert_called_once_with(
+                "foo: bar\n\nbaz: biz\n\navailable: True"
+            )
 
     @patch("checkbox_support.scripts.zapper_proxy.import_module")
     def test_get_capabilities_one_cap_multi_rows(self, import_mock):
@@ -171,7 +173,9 @@ def test_get_capabilities_one_cap_multi_rows(self, import_mock):
 
         with patch("builtins.print") as mocked_print:
             get_capabilities("0.0.0.0")
-            mocked_print.assert_called_once_with("foo: bar\nfoo2: bar2")
+            mocked_print.assert_called_once_with(
+                "foo: bar\nfoo2: bar2\n\navailable: True"
+            )
 
     @patch("checkbox_support.scripts.zapper_proxy.zapper_run")
     def test_main_run(self, mock_run):

checkbox-support/checkbox_support/scripts/zapper_proxy.py

@@ -73,8 +73,9 @@ def get_capabilities(host):
     """Get Zapper capabilities."""
     try:
         capabilities = zapper_run(host, "get_capabilities")
+        capabilities.append({"available": True})
     except SystemExit:
-        capabilities = []
+        capabilities = [{"available": False}]
 
     def stringify_cap(cap):
         return "\n".join(

providers/base/units/zapper/resource.pxu

@@ -7,3 +7,12 @@ _description:
  capable off.
 environ: ZAPPER_HOST
 command: checkbox-support-zapper-proxy get_capabilities
+
+id: zapper_reset_setup
+plugin: shell
+requires: zapper_capabilities.available == 'True'
+category_id: com.canonical.plainbox::info
+_summary: Reset the Zapper environment to prevent it interfering with other test cases.
+environ: ZAPPER_HOST
+command: checkbox-support-zapper-proxy reset_testing_setup  ||  { echo "Some jobs might be affected..."; true; }
+

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

@@ -14,11 +14,11 @@ include:
   bluetooth/zapper-a2dp
   input/zapper-keyboard
   monitor/zapper-edid
-  monitor/1_zapper_hdmi_.*
   usb/zapper-usb-insert-.*
   usb/zapper-usb-remove-.*
   usb3/zapper-usb-insert-.*
   usb3/zapper-usb-remove-.*
 bootstrap_include:
   zapper_capabilities
+  zapper_reset_setup
   graphics_card