tests: update expected messages in tests output

Signed-off-by: Renan Rodrigo <[email protected]>
canonical · Nov 15, 2023 · b4a0c39 · b4a0c39
1 parent b93f67f
commit b4a0c39
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/features/attached_enable.feature b/features/attached_enable.feature
@@ -1090,9 +1090,9 @@ Feature: Enable command behaviour when attached to an Ubuntu Pro subscription
         """
         And I attach `contract_token` with sudo and options `--no-auto-enable`
         And I verify that running `pro enable esm-infra` `with sudo` exits `1`
-        Then stderr matches regexp:
+        Then stdout matches regexp:
         """
-        Stderr: E: Unable to locate package some-package-aws
+        E: Unable to locate package some-package-aws
         """
 
     @series.xenial

diff --git a/features/enable_fips_cloud.feature b/features/enable_fips_cloud.feature
@@ -134,6 +134,7 @@ Feature: FIPS enablement in cloud based machines
             """
             Updating <fips-name> package lists
             Installing <fips-name> packages
+            Updating standard Ubuntu package lists
             <fips-name> enabled
             A reboot is required to complete install
             """
@@ -199,6 +200,7 @@ Feature: FIPS enablement in cloud based machines
             """
             Updating <fips-name> package lists
             Installing <fips-name> packages
+            Updating standard Ubuntu package lists
             <fips-name> enabled
             A reboot is required to complete install
             """
@@ -278,6 +280,7 @@ Feature: FIPS enablement in cloud based machines
             """
             Updating <fips-name> package lists
             Installing <fips-name> packages
+            Updating standard Ubuntu package lists
             <fips-name> enabled
             A reboot is required to complete install
             """
@@ -340,6 +343,7 @@ Feature: FIPS enablement in cloud based machines
             """
             Updating <fips-name> package lists
             Installing <fips-name> packages
+            Updating standard Ubuntu package lists
             <fips-name> enabled
             A reboot is required to complete install
             """
@@ -407,11 +411,12 @@ Feature: FIPS enablement in cloud based machines
         And I run `pro enable fips --assume-yes` with sudo
         Then stdout matches regexp:
         """
-        Updating package lists
+        Could not determine cloud, defaulting to generic FIPS package.
+        Updating FIPS package lists
         Installing FIPS packages
         Updating standard Ubuntu package lists
         FIPS enabled
-        A reboot is required to complete install
+        A reboot is required to complete install.
         """
         When I run `apt-cache policy ubuntu-fips` as non-root
         Then stdout does not match regexp:
@@ -456,11 +461,12 @@ Feature: FIPS enablement in cloud based machines
         And I run `pro enable fips --assume-yes` with sudo
         Then stdout matches regexp:
         """
-        Updating package lists
+        Could not determine cloud, defaulting to generic FIPS package.
+        Updating FIPS package lists
         Installing FIPS packages
         Updating standard Ubuntu package lists
         FIPS enabled
-        A reboot is required to complete install
+        A reboot is required to complete install.
         """
         When I run `apt-cache policy ubuntu-fips` as non-root
         Then stdout does not match regexp:

diff --git a/features/enable_fips_pro.feature b/features/enable_fips_pro.feature
@@ -25,6 +25,7 @@ Feature: FIPS enablement in PRO cloud based machines
                 """
                 Updating <fips-name> package lists
                 Installing <fips-name> packages
+                Updating standard Ubuntu package lists
                 <fips-name> enabled
                 A reboot is required to complete install
                 """
@@ -84,6 +85,7 @@ Feature: FIPS enablement in PRO cloud based machines
                 """
                 Updating <fips-name> package lists
                 Installing <fips-name> packages
+                Updating standard Ubuntu package lists
                 <fips-name> enabled
                 A reboot is required to complete install
                 """
@@ -144,6 +146,7 @@ Feature: FIPS enablement in PRO cloud based machines
             """
             Updating <fips-name> package lists
             Installing <fips-name> packages
+            Updating standard Ubuntu package lists
             <fips-name> enabled
             A reboot is required to complete install
             """

diff --git a/features/ubuntu_upgrade.feature b/features/ubuntu_upgrade.feature
@@ -71,6 +71,7 @@ Feature: Upgrade between releases when uaclient is attached
         """
         Updating <fips-name> package lists
         Installing <fips-name> packages
+        Updating standard Ubuntu package lists
         <fips-name> enabled
         A reboot is required to complete install
         """

diff --git a/features/unattached_status.feature b/features/unattached_status.feature
@@ -611,6 +611,7 @@ Feature: Unattached status
         esm-infra       +yes       +yes       +yes          +Expanded Security Maintenance for Infrastructure
         fips            +yes       +yes       +no           +NIST-certified FIPS crypto packages
         fips-preview    +yes       +yes       +no           +.*
+        fips-updates    +yes       +yes       +no           +.*
         livepatch       +yes       +yes       +yes          +Canonical Livepatch service
         """