Merge ~chad.smith/ubuntu/+source/ubuntu-advantage-tools:release-27-groovy into ubuntu/+source/ubuntu-advantage-tools:ubuntu/devel

[Chad Smith]

New upstream release of 27.0 for release into groovy

Avoiding rich commit history because this is a branch new client (python instead of bash) which represented a major upgrade that is backwards incompatible.

We will be following this verification procedure for SRU of ubuntu-advantage-tools in order to release into groovy: https://wiki.ubuntu.com/UbuntuAdvantageToolsUpdates

Note that groovy doesn't have esm-infra, esm-apps or FIPS product offerings so this client will not allow enabling any UA services:

Expect messages like:

root@test-g:~# ua enable esm-apps
One moment, checking your subscription first
ESM Apps is not available for Ubuntu 20.10 (Groovy Gorilla)

Functional equivalent debs have been uploaded to this ppa for testing https://launchpad.net/~orndorffgrant/+archive/ubuntu/uaclient-staging-27

to test:
$ cat > 27_test_setup.yaml <<EOF
#cloud-config
write_files:
- content: |
    # Ubuntu-Advantage client config file.
    contract_url: 'https://contracts.canonical.com'
    data_dir: /var/lib/ubuntu-advantage
    log_level: debug
    log_file: /var/log/ubuntu-advantage.log
    features:
        allow_beta: true
  owner: root:root
  path: /etc/ubuntu-advantage/uaclient.conf
  permissions: '0644'
apt:
  sources:
    ua_staging_ppa:
        source: 'deb http://ppa.launchpad.net/orndorffgrant/uaclient-staging-27/ubuntu \$RELEASE main'
        keyid: 74E59E9E
packages: [ubuntu-advantage-tools]
EOF

$ lxc launch ubuntu-daily:xenial test-27-x -c user.user-data="$(cat 27_test_setup.yaml)"
$ lxc exec test-27-x -- cloud-init status --wait --long # wait for pkg installs

$ lxc exec test-27-x -- ua version

$ lxc exec test-27-x -- ua status # show unattached

This machine is not attached to a UA subscription.
See https://ubuntu.com/advantage

# attach with token from https://ubuntu.com/advantage
$ lxc exec test-27-x -- ua attach <REDACTED>
# assert esm-infra auto enabled

# no failures on attach
root@test-27-h:~# grep Traceback /var/log/ubuntu-advantage.log

# assert default contract not authorized to esm-apps
$ lxc exec test-27-x -- ua enable esm-apps

will manipulate other subcommands

1ff489a... by Grant Orndorff on 2021-04-28

apt-hook: mitigate failures with true

In case something catastrophic happens
in our apt hooks, we now make sure the subprocess
always returns successfully by calling `true`
if our hook fails.

[Bryce Harrington (bryce)]

While it's unlikely groovy will be an upgrade path for ESM users, it's good to include this for completeness given it's still theoretically possible. My review has been super light, mainly just verifying the same changes are included as in the other branches.

Tagged and uploaded:

triage-groovy+20.10:~/pkg/UbuntuAdvantageTools/review-mp401983$ dput ubuntu ubuntu-advantage-tools_27.0~20.10.1_source.changes
Checking signature on .changes
gpg: /home/bryce/pkg/UbuntuAdvantageTools/review-mp401983/ubuntu-advantage-tools_27.0~20.10.1_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: /home/bryce/pkg/UbuntuAdvantageTools/review-mp401983/ubuntu-advantage-tools_27.0~20.10.1.dsc: Valid signature from E603B2578FB8F0FB
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ubuntu-advantage-tools_27.0~20.10.1.dsc: done.
  Uploading ubuntu-advantage-tools_27.0~20.10.1.tar.xz: done.
  Uploading ubuntu-advantage-tools_27.0~20.10.1_source.buildinfo: done.
  Uploading ubuntu-advantage-tools_27.0~20.10.1_source.changes: done.
Successfully uploaded packages.
triage-groovy+20.10:~/pkg/UbuntuAdvantageTools/review-mp401983$ cd ubuntu-advantage-tools-gu/
triage-groovy+20.10:~/pkg/UbuntuAdvantageTools/review-mp401983/ubuntu-advantage-tools-gu$ git ubuntu tag --upload
triage-groovy+20.10:~/pkg/UbuntuAdvantageTools/review-mp401983/ubuntu-advantage-tools-gu$ git push -f pkg upload/27.0_20.10.1

Enumerating objects: 250, done.
Counting objects: 100% (250/250), done.
Delta compression using up to 12 threads
Compressing objects: 100% (118/118), done.
Writing objects: 100% (163/163), 212.83 KiB | 443.00 KiB/s, done.
Total 163 (delta 67), reused 117 (delta 42), pack-reused 0
remote: Resolving deltas: 100% (67/67), completed with 53 local objects.
To ssh://git.launchpad.net/ubuntu/+source/ubuntu-advantage-tools
 * [new tag] upload/27.0_20.10.1 -> upload/27.0_20.10.1

review: Approve

b32b476... by Grant Orndorff on 2021-04-30

apt-hook: refactor json hook messaging to be dry

The message construction code in the json hook
was pretty repetitive. This cleans it up a bit
and also removes some unnecessary explicit struct
names in the tests.

4053b40... by Grant Orndorff on 2021-05-03

apt-hook: ignore go hook on some architectures

Golang doesn't support powerpc and riscv on older versions.
This configures our Build-Depends and Makefile to gracefully
handle scenarios where we can't build our go hook. We will
simply not ship the go hook in these limited scenarios.

Fixes: #1603

d32eef4... by Grant Orndorff on 2021-05-04

build: order build-depends alternatives newer first

When using alternatives in the Build-Depends section of
debian/control, we should always put the newer version of
a package first. This is because sbuild doesn't resolve
alternatives by default and we want sbuild to work on the
latest version of ubuntu with default settings.

LP: #1926949

f30579b... by Grant Orndorff on 2021-05-06

tests: fix subp ls error case

3bfe06c... by Chad Smith on 2021-05-07

changelog 27.0.1 & 27.0.2

4da4d2b... by Chad Smith on 2021-05-07

jenkinsfile: trusty sbuild --resolve-depends for CI runs

a186c59... by Chad Smith on 2021-05-07

changelog: 27.0.2~20.10.1

diff --git a/.gitignore b/.gitignore
index 2b2da67..29b86f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,11 @@ ubuntu_advantage_tools.dsc
 # test/jenkins artifacts
 pytest_results.xml
 reports/
+<<<<<<< .gitignore
+=======
+
+# apt-hook build artifacts
+apt-hook/hook
+apt-hook/ubuntu-advantage.pot
+apt-hook/json-hook-src/json-hook
+>>>>>>> .gitignore
diff --git a/Jenkinsfile b/Jenkinsfile
index 2082e19..925a9c3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -87,7 +87,11 @@ pipeline {
                         cp debian/changelog ${WORKSPACE}/debian/changelog-${SERIES_VERSION}
                         sed -i "s/${PKG_VERSION}/${NEW_PKG_VERSION}/" ${WORKSPACE}/debian/changelog-${SERIES_VERSION}
                         dpkg-source -l${WORKSPACE}/debian/changelog-${SERIES_VERSION} -b .
+<<<<<<< Jenkinsfile
                         sbuild --nolog --verbose --dist=${BUILD_SERIES} --no-run-lintian --append-to-version=~${SERIES_VERSION}  ../ubuntu-advantage-tools*${NEW_PKG_VERSION}*dsc
+=======
+                        sbuild --resolve-alternatives --nolog --verbose --dist=${BUILD_SERIES} --no-run-lintian --append-to-version=~${SERIES_VERSION}  ../ubuntu-advantage-tools*${NEW_PKG_VERSION}*dsc
+>>>>>>> Jenkinsfile
                         cp ./ubuntu-advantage-tools*${SERIES_VERSION}*.deb ${ARTIFACT_DIR}/ubuntu-advantage-tools-${BUILD_SERIES}.deb
                         cp ./ubuntu-advantage-pro*${SERIES_VERSION}*.deb ${ARTIFACT_DIR}/ubuntu-advantage-pro-${BUILD_SERIES}.deb
                         '''
@@ -108,7 +112,11 @@ pipeline {
                         cp debian/changelog ${WORKSPACE}/debian/changelog-${SERIES_VERSION}
                         sed -i "s/${PKG_VERSION}/${NEW_PKG_VERSION}/" ${WORKSPACE}/debian/changelog-${SERIES_VERSION}
                         dpkg-source -l${WORKSPACE}/debian/changelog-${SERIES_VERSION} -b .
+<<<<<<< Jenkinsfile
                         sbuild --nolog --verbose --dist=${BUILD_SERIES} --no-run-lintian --append-to-version=~${SERIES_VERSION}  ../ubuntu-advantage-tools*${NEW_PKG_VERSION}*dsc
+=======
+                        sbuild --resolve-alternatives --nolog --verbose --dist=${BUILD_SERIES} --no-run-lintian --append-to-version=~${SERIES_VERSION}  ../ubuntu-advantage-tools*${NEW_PKG_VERSION}*dsc
+>>>>>>> Jenkinsfile
                         cp ./ubuntu-advantage-tools*${SERIES_VERSION}*.deb ${ARTIFACT_DIR}/ubuntu-advantage-tools-${BUILD_SERIES}.deb
                         cp ./ubuntu-advantage-pro*${SERIES_VERSION}*.deb ${ARTIFACT_DIR}/ubuntu-advantage-pro-${BUILD_SERIES}.deb
                         '''
@@ -129,7 +137,11 @@ pipeline {
                         cp debian/changelog ${WORKSPACE}/debian/changelog-${SERIES_VERSION}
                         sed -i "s/${PKG_VERSION}/${NEW_PKG_VERSION}/" ${WORKSPACE}/debian/changelog-${SERIES_VERSION}
                         dpkg-source -l${WORKSPACE}/debian/changelog-${SERIES_VERSION} -b .
+<<<<<<< Jenkinsfile
                         sbuild --nolog --verbose --dist=${BUILD_SERIES} --no-run-lintian --append-to-version=~${SERIES_VERSION}  ../ubuntu-advantage-tools*${NEW_PKG_VERSION}*dsc
+=======
+                        sbuild --resolve-alternatives --nolog --verbose --dist=${BUILD_SERIES} --no-run-lintian --append-to-version=~${SERIES_VERSION}  ../ubuntu-advantage-tools*${NEW_PKG_VERSION}*dsc
+>>>>>>> Jenkinsfile
                         cp ./ubuntu-advantage-tools*${SERIES_VERSION}*.deb ${ARTIFACT_DIR}/ubuntu-advantage-tools-${BUILD_SERIES}.deb
                         cp ./ubuntu-advantage-pro*${SERIES_VERSION}*.deb ${ARTIFACT_DIR}/ubuntu-advantage-pro-${BUILD_SERIES}.deb
                         '''
@@ -150,7 +162,11 @@ pipeline {
                         cp debian/changelog ${WORKSPACE}/debian/changelog-${SERIES_VERSION}
                         sed -i "s/${PKG_VERSION}/${NEW_PKG_VERSION}/" ${WORKSPACE}/debian/changelog-${SERIES_VERSION}
                         dpkg-source -l${WORKSPACE}/debian/changelog-${SERIES_VERSION} -b .
+<<<<<<< Jenkinsfile
                         sbuild --nolog --verbose --dist=${BUILD_SERIES} --no-run-lintian --append-to-version=~${SERIES_VERSION}  ../ubuntu-advantage-tools*${NEW_PKG_VERSION}*dsc
+=======
+                        sbuild --resolve-alternatives --nolog --verbose --dist=${BUILD_SERIES} --no-run-lintian --append-to-version=~${SERIES_VERSION}  ../ubuntu-advantage-tools*${NEW_PKG_VERSION}*dsc
+>>>>>>> Jenkinsfile
                         cp ./ubuntu-advantage-tools*${SERIES_VERSION}*.deb ${ARTIFACT_DIR}/ubuntu-advantage-tools-${BUILD_SERIES}.deb
                         cp ./ubuntu-advantage-pro*${SERIES_VERSION}*.deb ${ARTIFACT_DIR}/ubuntu-advantage-pro-${BUILD_SERIES}.deb
                         '''
diff --git a/apt-hook/Makefile b/apt-hook/Makefile
index 15c4856..11294b1 100644
--- a/apt-hook/Makefile
+++ b/apt-hook/Makefile
@@ -1,3 +1,21 @@
+# the go hook steps will be skipped if this is a nonempty string
+SKIP_GO_HOOK = ""
+
+GO_BIN = $(shell which go)
+# Try go-1.14 and go-1.10 if not in path
+ifeq ($(GO_BIN),)
+	ifneq ($(wildcard /usr/lib/go-1.14/bin/go),)
+		GO_BIN = /usr/lib/go-1.14/bin/go
+	else ifneq ($(wildcard /usr/lib/go-1.10/bin/go),)
+		GO_BIN = /usr/lib/go-1.10/bin/go
+	endif
+endif
+
+# If still not found then just don't build the go hook
+ifeq ($(GO_BIN),)
+	SKIP_GO_HOOK = "1"
+endif
+
 all: build
 
 build: hook ubuntu-advantage.pot json-hook
@@ -9,15 +27,27 @@ hook: hook.cc
 	$(CXX) -Wall -Wextra -pedantic -std=c++11 $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -g -o hook hook.cc -lapt-pkg $(LDLIBS)
 
 json-hook:
+<<<<<<< apt-hook/Makefile
 	cd json-hook-src && GOCACHE=/tmp/ go build json-hook.go
+=======
+	[ $(SKIP_GO_HOOK) ] || (cd json-hook-src && GOCACHE=/tmp/ $(GO_BIN) build json-hook.go)
+>>>>>>> apt-hook/Makefile
 
 install: hook json-hook
 	install -D -m 644 20apt-esm-hook.conf $(DESTDIR)/etc/apt/apt.conf.d/20apt-esm-hook.conf
 	install -D -m 755 hook $(DESTDIR)/usr/lib/ubuntu-advantage/apt-esm-hook
+<<<<<<< apt-hook/Makefile
 	install -D -m 755 json-hook-src/json-hook $(DESTDIR)/usr/lib/ubuntu-advantage/apt-esm-json-hook
+=======
+	[ $(SKIP_GO_HOOK) ] || install -D -m 755 json-hook-src/json-hook $(DESTDIR)/usr/lib/ubuntu-advantage/apt-esm-json-hook
+>>>>>>> apt-hook/Makefile
 
 clean:
 	rm -f hook ubuntu-advantage.pot json-hook-src/json-hook
 
 test:
+<<<<<<< apt-hook/Makefile
 	cd json-hook-src && go test
+=======
+	[ $(SKIP_GO_HOOK) ] || (cd json-hook-src && GOCACHE=/tmp/ $(GO_BIN) test)
+>>>>>>> apt-hook/Makefile
diff --git a/apt-hook/json-hook-src/go.mod b/apt-hook/json-hook-src/go.mod
index 66726af..2823e25 100644
--- a/apt-hook/json-hook-src/go.mod
+++ b/apt-hook/json-hook-src/go.mod
@@ -1,3 +1,7 @@
 module json-hook
 
+<<<<<<< apt-hook/json-hook-src/go.mod
 go 1.2
+=======
+go 1.7
+>>>>>>> apt-hook/json-hook-src/go.mod
diff --git a/apt-hook/json-hook-src/json-hook.go b/apt-hook/json-hook-src/json-hook.go
index 0f2e3eb..fc6b704 100644
--- a/apt-hook/json-hook-src/json-hook.go
+++ b/apt-hook/json-hook-src/json-hook.go
@@ -45,6 +45,21 @@ type jsonRPC struct {
 	} `json:"params"`
 }
 
+<<<<<<< apt-hook/json-hook-src/json-hook.go
+=======
+func updatesFromSource(count int, source string, first bool) string {
+	security := ""
+	if first {
+		security = "security "
+	}
+	updates := "updates"
+	if count == 1 {
+		updates = "update"
+	}
+	return fmt.Sprintf("%d %s %s%s", count, source, security, updates)
+}
+
+>>>>>>> apt-hook/json-hook-src/json-hook.go
 func createUpdateMessage(standardSecurityCount int, esmInfraCount int, esmAppsCount int) string {
 	displayStandard := true
 	displayEsmInfra := true
@@ -72,6 +87,7 @@ func createUpdateMessage(standardSecurityCount int, esmInfraCount int, esmAppsCo
 	}
 
 	standardUpdates := ""
+<<<<<<< apt-hook/json-hook-src/json-hook.go
 	esmInfraUpdates := ""
 	esmAppsUpdates := ""
 	if displayStandard {
@@ -118,6 +134,32 @@ func createUpdateMessage(standardSecurityCount int, esmInfraCount int, esmAppsCo
 	}
 
 	return standardUpdates + esmInfraUpdates + esmAppsUpdates
+=======
+	afterStandard := ""
+	esmInfraUpdates := ""
+	afterInfra := ""
+	esmAppsUpdates := ""
+
+	if displayStandard {
+		standardUpdates = updatesFromSource(standardSecurityCount, "standard", true)
+		if displayEsmInfra && displayEsmApps {
+			afterStandard = ", "
+		} else if displayEsmInfra || displayEsmApps {
+			afterStandard = " and "
+		}
+	}
+	if displayEsmInfra {
+		esmInfraUpdates = updatesFromSource(esmInfraCount, "esm-infra", esmInfraFirst)
+		if displayEsmApps {
+			afterInfra = " and "
+		}
+	}
+	if displayEsmApps {
+		esmAppsUpdates = updatesFromSource(esmAppsCount, "esm-apps", esmAppsFirst)
+	}
+
+	return standardUpdates + afterStandard + esmInfraUpdates + afterInfra + esmAppsUpdates
+>>>>>>> apt-hook/json-hook-src/json-hook.go
 }
 
 func fromOriginAndArchive(pkgVersion jsonRPCPackageVersion, origin string, archive string) bool {
diff --git a/apt-hook/json-hook-src/json-hook_test.go b/apt-hook/json-hook-src/json-hook_test.go
index cfc1788..135ec2c 100644
--- a/apt-hook/json-hook-src/json-hook_test.go
+++ b/apt-hook/json-hook-src/json-hook_test.go
@@ -14,6 +14,7 @@ func TestCreateUpdateMessages(t *testing.T) {
 		expectedMessage       string
 	}
 	testParamsList := []params{
+<<<<<<< apt-hook/json-hook-src/json-hook_test.go
 		params{0, 0, 0, ""},
 		params{0, 0, 1, "1 esm-apps security update"},
 		params{0, 0, 2, "2 esm-apps security updates"},
@@ -41,6 +42,35 @@ func TestCreateUpdateMessages(t *testing.T) {
 		params{2, 2, 0, "2 standard security updates and 2 esm-infra updates"},
 		params{2, 2, 1, "2 standard security updates, 2 esm-infra updates and 1 esm-apps update"},
 		params{2, 2, 2, "2 standard security updates, 2 esm-infra updates and 2 esm-apps updates"},
+=======
+		{0, 0, 0, ""},
+		{0, 0, 1, "1 esm-apps security update"},
+		{0, 0, 2, "2 esm-apps security updates"},
+		{0, 1, 0, "1 esm-infra security update"},
+		{0, 1, 1, "1 esm-infra security update and 1 esm-apps update"},
+		{0, 1, 2, "1 esm-infra security update and 2 esm-apps updates"},
+		{0, 2, 0, "2 esm-infra security updates"},
+		{0, 2, 1, "2 esm-infra security updates and 1 esm-apps update"},
+		{0, 2, 2, "2 esm-infra security updates and 2 esm-apps updates"},
+		{1, 0, 0, "1 standard security update"},
+		{1, 0, 1, "1 standard security update and 1 esm-apps update"},
+		{1, 0, 2, "1 standard security update and 2 esm-apps updates"},
+		{1, 1, 0, "1 standard security update and 1 esm-infra update"},
+		{1, 1, 1, "1 standard security update, 1 esm-infra update and 1 esm-apps update"},
+		{1, 1, 2, "1 standard security update, 1 esm-infra update and 2 esm-apps updates"},
+		{1, 2, 0, "1 standard security update and 2 esm-infra updates"},
+		{1, 2, 1, "1 standard security update, 2 esm-infra updates and 1 esm-apps update"},
+		{1, 2, 2, "1 standard security update, 2 esm-infra updates and 2 esm-apps updates"},
+		{2, 0, 0, "2 standard security updates"},
+		{2, 0, 1, "2 standard security updates and 1 esm-apps update"},
+		{2, 0, 2, "2 standard security updates and 2 esm-apps updates"},
+		{2, 1, 0, "2 standard security updates and 1 esm-infra update"},
+		{2, 1, 1, "2 standard security updates, 1 esm-infra update and 1 esm-apps update"},
+		{2, 1, 2, "2 standard security updates, 1 esm-infra update and 2 esm-apps updates"},
+		{2, 2, 0, "2 standard security updates and 2 esm-infra updates"},
+		{2, 2, 1, "2 standard security updates, 2 esm-infra updates and 1 esm-apps update"},
+		{2, 2, 2, "2 standard security updates, 2 esm-infra updates and 2 esm-apps updates"},
+>>>>>>> apt-hook/json-hook-src/json-hook_test.go
 	}
 
 	for i, testParams := range testParamsList {
@@ -62,7 +92,11 @@ func TestCountSecurityUpdates(t *testing.T) {
 		expectedEsmAppsCount          int
 	}
 	testParamsList := []params{
+<<<<<<< apt-hook/json-hook-src/json-hook_test.go
 		params{mockJson, 1, 2, 3},
+=======
+		{mockJson, 1, 2, 3},
+>>>>>>> apt-hook/json-hook-src/json-hook_test.go
 	}
 
 	for i, testParams := range testParamsList {
diff --git a/debian/changelog b/debian/changelog
index 9c6e17f..9e60d7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+<<<<<<< debian/changelog
+=======
+ubuntu-advantage-tools (27.0.2~20.10.1) groovy; urgency=medium
+
+  * d/control:
+    - order build-depends alternatives newer first (LP: #1926949)
+    - apt-hook: do not attempt to package go APT JSON hook on some
+      architectures (GH: #1603) (LP: #1927795)
+  * Bug-fix release 27.0.2: build failures on riscv64 and powerpc
+    - apt-hook: refactor json hook messaging to be dry
+    - tests: fix subp ls error case for powerpc builds
+    - jenkinsfile: add --resolve-alternatives for trusty builds
+
+ -- Chad Smith <[e-mail]>  Fri, 07 May 2021 11:58:03 -0600
+
+>>>>>>> debian/changelog
 ubuntu-advantage-tools (27.0.1) impish; urgency=medium
 
   * Add .gitignore and cleanup ignored directory .pytest_cache
@@ -8,6 +24,10 @@ ubuntu-advantage-tools (27.0.1) impish; urgency=medium
 ubuntu-advantage-tools (27.0) impish; urgency=medium
 
   * New upstream release 27.0:
+<<<<<<< debian/changelog
+=======
+    - apt-hook: mitigate failures with true
+>>>>>>> debian/changelog
     - messages: add optional (s) to apt messaging to include
       singular/plural pkgs
     - apt-hook: avoid reporting and counting duplicate package
diff --git a/debian/control b/debian/control
index cd28a1f..660a80d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,10 +6,17 @@ Build-Depends: bash-completion,
                debhelper (>=9),
                debianutils,
                dh-python,
+<<<<<<< debian/control
                dh-systemd | debhelper (>= 13.3),
                gettext,
                git,
                golang,
+=======
+               debhelper (>= 13.3) | dh-systemd,
+               gettext,
+               git,
+               golang-go (>= 2:1.14~) [!powerpc] | golang-1.14-go [!powerpc] | golang-1.10-go [!powerpc !riscv64],
+>>>>>>> debian/control
                libapt-pkg-dev,
                po-debconf,
                python3 (>= 3.4),
diff --git a/debian/rules b/debian/rules
index 9bea522..57898f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,7 @@ override_dh_auto_build:
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	make -C apt-hook test
 	python3 -m pytest
 ifdef FLAKE8
 	# required for Trusty: flake8 does not install a __main__  for -m
diff --git a/uaclient/tests/test_util.py b/uaclient/tests/test_util.py
index 019faf2..29a5bd2 100644
--- a/uaclient/tests/test_util.py
+++ b/uaclient/tests/test_util.py
@@ -291,11 +291,12 @@ class TestSubp:
         with pytest.raises(util.ProcessExecutionError) as excinfo:
             util.subp(["ls", "--bogus"])
 
-        expected_error = (
-            "Failed running command 'ls --bogus' [exit(2)]."
-            " Message: ls: unrecognized option"
-        )
-        assert expected_error in str(excinfo.value)
+        expected_errors = [
+            "Failed running command 'ls --bogus' [exit(2)].",
+            "ls: unrecognized option '--bogus'",
+        ]
+        for msg in expected_errors:
+            assert msg in str(excinfo.value)
         assert 0 == m_sleep.call_count  # no retries
 
     @mock.patch("uaclient.util.time.sleep")
@@ -795,6 +796,37 @@ class TestIsConfigValueTrue:
             config=cfg.cfg, path_to_value="features.allow_beta"
         )
         assert return_val == actual_val
+<<<<<<< uaclient/tests/test_util.py
+
+    @pytest.mark.parametrize(
+        "config_dict, key_val",
+        [
+            ({"allow_beta": "tru"}, "tru"),
+            ({"allow_beta": "Tre"}, "Tre"),
+            ({"allow_beta": "flse"}, "flse"),
+            ({"allow_beta": "Fale"}, "Fale"),
+        ],
+    )
+    def test_exception_is_config_value_true(
+        self, config_dict, key_val, FakeConfig
+    ):
+        path_to_value = "features.allow_beta"
+        cfg = FakeConfig()
+        cfg.override_features(config_dict)
+        with pytest.raises(exceptions.UserFacingError) as excinfo:
+            util.is_config_value_true(
+                config=cfg.cfg, path_to_value=path_to_value
+            )
+
+        expected_msg = status.ERROR_INVALID_CONFIG_VALUE.format(
+            path_to_value=path_to_value,
+            expected_value="boolean string: true or false",
+            value=key_val,
+        )
+        assert expected_msg == str(excinfo.value)
+
+
+=======
 
     @pytest.mark.parametrize(
         "config_dict, key_val",
@@ -824,6 +856,7 @@ class TestIsConfigValueTrue:
         assert expected_msg == str(excinfo.value)
 
 
+>>>>>>> uaclient/tests/test_util.py
 class TestRedactSensitiveLogs:
     @pytest.mark.parametrize(
         "raw_log,expected",