diff options
| author | John Snow <jsnow@redhat.com> | 2023-09-28 00:49:43 -0400 |
|---|---|---|
| committer | John Snow <jsnow@redhat.com> | 2023-10-11 16:02:02 -0400 |
| commit | 46d4747ab59721e657c0012d2f2ca6f3aeb7085d (patch) | |
| tree | 8dbba7bca7897973da5f3ef4983b090a8b1e1078 /tests/avocado/machine_aspeed.py | |
| parent | d39673781361ed528c2afba7197f26481caab482 (diff) | |
| download | focaccia-qemu-46d4747ab59721e657c0012d2f2ca6f3aeb7085d.tar.gz focaccia-qemu-46d4747ab59721e657c0012d2f2ca6f3aeb7085d.zip | |
python/machine: remove unused sock_dir argument
By using a socketpair for all of the sockets managed by the VM class and its extensions, we don't need the sock_dir argument anymore, so remove it. We only added this argument so that we could specify a second, shorter temporary directory for cases where the temp/log dirs were "too long" as a socket name on macOS. We don't need it for this class now. In one case, avocado testing takes over responsibility for creating an appropriate sockdir. Signed-off-by: John Snow <jsnow@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Message-id: 20230928044943.849073-7-jsnow@redhat.com Signed-off-by: John Snow <jsnow@redhat.com>
Diffstat (limited to 'tests/avocado/machine_aspeed.py')
| -rw-r--r-- | tests/avocado/machine_aspeed.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/avocado/machine_aspeed.py b/tests/avocado/machine_aspeed.py index 90f1b7cb77..f691ee3fb8 100644 --- a/tests/avocado/machine_aspeed.py +++ b/tests/avocado/machine_aspeed.py @@ -247,7 +247,10 @@ class AST2x00Machine(QemuSystemTest): image_path = self.fetch_asset(image_url, asset_hash=image_hash, algorithm='sha256') - socket = os.path.join(self.vm.sock_dir, 'swtpm-socket') + # force creation of VM object, which also defines self._sd + vm = self.vm + + socket = os.path.join(self._sd.name, 'swtpm-socket') subprocess.run(['swtpm', 'socket', '-d', '--tpm2', '--tpmstate', f'dir={self.vm.temp_dir}', |