From 890c785d0b482bf53aa9cd14c2dbaad6310c0732 Mon Sep 17 00:00:00 2001 From: Aaron Whitehouse Date: Thu, 17 Mar 2022 21:51:29 +0000 Subject: [PATCH] Fixes to zpool creation test. --- tests/0_monitoring_tests/test_monitoring.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/0_monitoring_tests/test_monitoring.py b/tests/0_monitoring_tests/test_monitoring.py index 1ef51d6..3ee3896 100644 --- a/tests/0_monitoring_tests/test_monitoring.py +++ b/tests/0_monitoring_tests/test_monitoring.py @@ -36,11 +36,14 @@ class TestMonitoringOutput(unittest.TestCase): """Test what happens if there is a zpool, but with no snapshots""" # Make the zpool - if os.environ.get("POOL_TARGET") != "": + if os.environ.get("POOL_TARGET") == "": + pool_disk_image = "/zpool.img" + else: subprocess.run(["mkdir", "-p", os.environ.get("POOL_TARGET")], check=True) + pool_disk_image = os.environ.get("POOL_TARGET") + "/zpool.img" - subprocess.run(["truncate", "-s", "5120M", os.environ.get("POOL_TARGET") + "/zpool.img"], check=True) - subprocess.run(["zpool", "create", "-f", os.environ.get("POOL_NAME"), os.environ.get("POOL_TARGET") + "/zpool.img"], check=True) + subprocess.run(["truncate", "-s", "5120M", pool_disk_image], check=True) + subprocess.run(["zpool", "create", "-f", os.environ.get("POOL_NAME"), pool_disk_image], check=True) # Run sanoid --monitor-snapshots before doing anything else return_info = monitor_snapshots_command()