Merge pull request #3212 from canonical/vm-test-fixes-33.2

tests: minor fixups
canonical · Jul 22, 2024 · cbeb318 · cbeb318
2 parents d144945 + 30fe8e0
commit cbeb318
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/features/attached_enable.feature b/features/attached_enable.feature
@@ -700,7 +700,7 @@ Feature: Enable command behaviour when attached to an Ubuntu Pro subscription
     Then I verify that running `pro enable livepatch --format json --assume-yes` `with sudo` exits `1`
     And I will see the following on stdout
       """
-      {"_schema_version": "0.1", "errors": [{"message": "Cannot enable Livepatch when FIPS is enabled.", "message_code": "livepatch-error-when-fips-enabled", "service": "livepatch", "type": "service"}], "failed_services": ["livepatch"], "needs_reboot": false, "processed_services": [], "result": "failure", "warnings": []}
+      {"_schema_version": "0.1", "errors": [{"additional_info": null, "message": "Cannot enable Livepatch when FIPS is enabled.", "message_code": "livepatch-error-when-fips-enabled", "service": "livepatch", "type": "service"}], "failed_services": ["livepatch"], "needs_reboot": false, "processed_services": [], "result": "failure", "warnings": []}
       """
 
   Scenario: Attached enable fips on a machine with livepatch active
@@ -729,7 +729,7 @@ Feature: Enable command behaviour when attached to an Ubuntu Pro subscription
     And stdout is a json matching the `ua_operation` schema
     And I will see the following on stdout:
       """
-      {"_schema_version": "0.1", "errors": [{"message": "Cannot enable FIPS when Livepatch is enabled.", "message_code": "incompatible-service-stops-enable", "service": "fips", "type": "service"}], "failed_services": ["fips"], "needs_reboot": false, "processed_services": [], "result": "failure", "warnings": []}
+      {"_schema_version": "0.1", "errors": [{"additional_info": null, "message": "Cannot enable FIPS when Livepatch is enabled.", "message_code": "incompatible-service-stops-enable", "service": "fips", "type": "service"}], "failed_services": ["fips"], "needs_reboot": false, "processed_services": [], "result": "failure", "warnings": []}
       """
 
   @slow

diff --git a/features/proxy_config.feature b/features/proxy_config.feature
@@ -1188,7 +1188,7 @@ Feature: Proxy configuration
     Then I verify that `esm-apps` is enabled
     And I verify that `esm-infra` is enabled
     When I run `pro disable livepatch --assume-yes` with sudo
-    When I run `pro enable realtime-kernel` `with sudo` and stdin `y`
+    When I run `pro enable realtime-kernel --assume-yes` with sudo
     Then stdout contains substring:
       """
       Installing Real-time kernel packages

diff --git a/features/schemas/ua_operation.json b/features/schemas/ua_operation.json
@@ -25,7 +25,7 @@
              "type": ["null", "string"]
            },
            "additional_info": {
-             "type": "object"
+             "type": ["null", "object"]
            }
         },
         "patternProperties": {