diff options
Diffstat (limited to 'tests/sources')
| -rw-r--r-- | tests/sources/git.py | 6 | ||||
| -rw-r--r-- | tests/sources/previous_source_access/plugins/sources/foo_transform.py | 2 | ||||
| -rw-r--r-- | tests/sources/tar.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/sources/git.py b/tests/sources/git.py index f3d2e2809..98891a9af 100644 --- a/tests/sources/git.py +++ b/tests/sources/git.py @@ -869,11 +869,11 @@ def test_git_describe(cli, tmpdir, datafiles, ref_storage, tag_type): options = [] else: options = ['--tags'] - describe = subprocess.check_output(['git', 'describe'] + options, + describe = subprocess.check_output(['git', 'describe', *options], cwd=checkout).decode('ascii') assert describe.startswith('tag2-2-') - describe_fp = subprocess.check_output(['git', 'describe', '--first-parent'] + options, + describe_fp = subprocess.check_output(['git', 'describe', '--first-parent', *options], cwd=checkout).decode('ascii') assert describe_fp.startswith('tag1-2-') @@ -979,7 +979,7 @@ def test_git_describe_head_is_tagged(cli, tmpdir, datafiles, ref_storage, tag_ty options = [] else: options = ['--tags'] - describe = subprocess.check_output(['git', 'describe'] + options, + describe = subprocess.check_output(['git', 'describe', *options], cwd=checkout).decode('ascii') assert describe.startswith('tag') diff --git a/tests/sources/previous_source_access/plugins/sources/foo_transform.py b/tests/sources/previous_source_access/plugins/sources/foo_transform.py index 7101bfd24..820946454 100644 --- a/tests/sources/previous_source_access/plugins/sources/foo_transform.py +++ b/tests/sources/previous_source_access/plugins/sources/foo_transform.py @@ -30,7 +30,7 @@ class FooTransformSource(Source): return path def configure(self, node): - self.node_validate(node, ['ref'] + Source.COMMON_CONFIG_KEYS) + self.node_validate(node, ['ref', *Source.COMMON_CONFIG_KEYS]) self.ref = self.node_get_member(node, str, 'ref', None) def preflight(self): diff --git a/tests/sources/tar.py b/tests/sources/tar.py index 959ff890c..9284a25a3 100644 --- a/tests/sources/tar.py +++ b/tests/sources/tar.py @@ -377,7 +377,7 @@ def test_netrc_already_specified_user(cli, datafiles, server_type, tmpdir): with create_file_server(server_type) as server: server.add_user('otheruser', '12345', file_server_files) parts = urllib.parse.urlsplit(server.base_url()) - base_url = urllib.parse.urlunsplit([parts[0]] + ['otheruser@{}'.format(parts[1])] + list(parts[2:])) + base_url = urllib.parse.urlunsplit([parts[0], 'otheruser@{}'.format(parts[1]), *parts[2:]]) generate_project_file_server(base_url, project) src_tar = os.path.join(file_server_files, 'a.tar.gz') |