From 9ce764521be12059c514fcff78f77107aa72e197 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin@piware.de>
Date: Tue, 2 Jun 2020 18:56:34 +0200
Subject: [PATCH] test: Put VM image overlay into /var/tmp
At least in our CI, the default place to store VM runtime overlays
(testvm.get_temp_dir()) points to a tmpfs file, so that tests can put VM
overlays into RAM and are not affected by slow I/O. But that doesn't
work for composer, as it tends to produce huge overlays due to real-life
OS composed trees.
Use /var/tmp/ instead, which is meant for large files.
Also simplify the VirtMachine invocation -- if `identity_file` is None,
that's fine -- it's the default value of that argument anyway.
Cherry-picked from master commit 9b8e0e2335c5
---
test/composertest.py | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/test/composertest.py b/test/composertest.py
index f2abc697..11dfb0fe 100755
--- a/test/composertest.py
+++ b/test/composertest.py
@@ -30,10 +30,12 @@ class VirtMachineTestCase(unittest.TestCase):
def setUpTestMachine(self, image, identity_file=None):
self.network = testvm.VirtNetwork(0)
- if identity_file:
- self.machine = testvm.VirtMachine(image, networking=self.network.host(), cpus=2, memory_mb=2048, identity_file=identity_file, graphics=True)
- else:
- self.machine = testvm.VirtMachine(image, networking=self.network.host(), cpus=2, memory_mb=2048, graphics=True)
+ # default overlay directory is not big enough to hold the large composed trees; thus put overlay into /var/tmp/
+ self.machine = testvm.VirtMachine(image, networking=self.network.host(),
+ cpus=2, memory_mb=2048,
+ overlay_dir="/var/tmp",
+ identity_file=identity_file,
+ graphics=True)
print("Starting virtual machine '{}'".format(image))
self.machine.start()