Fix installing ppa for LXD running as non root

canonical · Nov 25, 2020 · 7e80caf · 7e80caf
1 parent 0e5e5ab
commit 7e80caf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/tests/integration_tests/bugs/test_lp1900837.py b/tests/integration_tests/bugs/test_lp1900837.py
@@ -18,7 +18,7 @@ def test_permissions_unchanged(self, client):
         assert "644" == _get_log_perms(client)
 
         # Set permissions to 600 and confirm our assertion passes pre-reboot
-        client.execute("chmod 600 /var/log/cloud-init.log")
+        client.execute("chmod 600 /var/log/cloud-init.log", use_sudo=True)
         assert "600" == _get_log_perms(client)
 
         # Reboot

diff --git a/tests/integration_tests/conftest.py b/tests/integration_tests/conftest.py
@@ -105,7 +105,9 @@ def setup_image(session_cloud):
         client.install_proposed_image()
     elif integration_settings.CLOUD_INIT_SOURCE.startswith('ppa:'):
         client = session_cloud.launch()
-        client.install_ppa(integration_settings.CLOUD_INIT_SOURCE)
+        client.install_ppa(
+            integration_settings.CLOUD_INIT_SOURCE
+        )
     elif os.path.isfile(str(integration_settings.CLOUD_INIT_SOURCE)):
         client = session_cloud.launch()
         client.install_deb()

diff --git a/tests/integration_tests/instances.py b/tests/integration_tests/instances.py
@@ -108,10 +108,10 @@ def install_proposed_image(self):
     def install_ppa(self, repo):
         log.info('Installing PPA')
         remote_script = (
-            '{sudo} add-apt-repository {repo} -y && '
-            '{sudo} apt-get update -q && '
-            '{sudo} apt-get install -qy cloud-init'
-        ).format(sudo='sudo' if self.use_sudo else '', repo=repo)
+            'sudo add-apt-repository {repo} -y && '
+            'sudo apt-get update -q && '
+            'sudo apt-get install -qy cloud-init'
+        ).format(repo=repo)
         self._install_new_cloud_init(remote_script)
 
     def install_deb(self):