summaryrefslogtreecommitdiff
path: root/tests/integration_tests/instances.py
diff options
context:
space:
mode:
authorJames Falcon <TheRealFalcon@users.noreply.github.com>2020-11-23 15:52:19 -0600
committerGitHub <noreply@github.com>2020-11-23 16:52:19 -0500
commit6e86d2a5649b3a9113923c73154ebf02224732a6 (patch)
tree689c1ae070b08795288e792c2f4af3c73d8fdc4d /tests/integration_tests/instances.py
parent8a493bf08d8b09d4f3a35dae725756d157844201 (diff)
downloadvyos-cloud-init-6e86d2a5649b3a9113923c73154ebf02224732a6.tar.gz
vyos-cloud-init-6e86d2a5649b3a9113923c73154ebf02224732a6.zip
Ensure proper root permissions in integration tests (#664)
Tests previously assumed that when executing commands and transferring files that user will have root permissions. This change updated integration testing infrastructure so that is true.
Diffstat (limited to 'tests/integration_tests/instances.py')
-rw-r--r--tests/integration_tests/instances.py45
1 files changed, 35 insertions, 10 deletions
diff --git a/tests/integration_tests/instances.py b/tests/integration_tests/instances.py
index ca0b38d5..9b13288c 100644
--- a/tests/integration_tests/instances.py
+++ b/tests/integration_tests/instances.py
@@ -1,9 +1,11 @@
# This file is part of cloud-init. See LICENSE file for license information.
import logging
import os
+import uuid
from tempfile import NamedTemporaryFile
from pycloudlib.instance import BaseInstance
+from pycloudlib.result import Result
from tests.integration_tests import integration_settings
@@ -18,6 +20,11 @@ except ImportError:
log = logging.getLogger('integration_testing')
+def _get_tmp_path():
+ tmp_filename = str(uuid.uuid4())
+ return '/var/tmp/{}.tmp'.format(tmp_filename)
+
+
class IntegrationInstance:
use_sudo = True
@@ -30,21 +37,39 @@ class IntegrationInstance:
def destroy(self):
self.instance.delete()
- def execute(self, command):
- return self.instance.execute(command)
+ def execute(self, command, *, use_sudo=None) -> Result:
+ if self.instance.username == 'root' and use_sudo is False:
+ raise Exception('Root user cannot run unprivileged')
+ if use_sudo is None:
+ use_sudo = self.use_sudo
+ return self.instance.execute(command, use_sudo=use_sudo)
- def pull_file(self, remote_file, local_file):
- self.instance.pull_file(remote_file, local_file)
+ def pull_file(self, remote_path, local_path):
+ # First copy to a temporary directory because of permissions issues
+ tmp_path = _get_tmp_path()
+ self.instance.execute('cp {} {}'.format(remote_path, tmp_path))
+ self.instance.pull_file(tmp_path, local_path)
def push_file(self, local_path, remote_path):
- self.instance.push_file(local_path, remote_path)
+ # First push to a temporary directory because of permissions issues
+ tmp_path = _get_tmp_path()
+ self.instance.push_file(local_path, tmp_path)
+ self.execute('mv {} {}'.format(tmp_path, remote_path))
def read_from_file(self, remote_path) -> str:
- tmp_file = NamedTemporaryFile('r')
- self.pull_file(remote_path, tmp_file.name)
- with tmp_file as f:
- contents = f.read()
- return contents
+ result = self.execute('cat {}'.format(remote_path))
+ if result.failed:
+ # TODO: Raise here whatever pycloudlib raises when it has
+ # a consistent error response
+ raise IOError(
+ 'Failed reading remote file via cat: {}\n'
+ 'Return code: {}\n'
+ 'Stderr: {}\n'
+ 'Stdout: {}'.format(
+ remote_path, result.return_code,
+ result.stderr, result.stdout)
+ )
+ return result.stdout
def write_to_file(self, remote_path, contents: str):
# Writes file locally and then pushes it rather