38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
|
From 4ed78b116774dcbf78cfc556c823bdb7f8384068 Mon Sep 17 00:00:00 2001
|
||
|
|
From: James Falcon <james.falcon@canonical.com>
|
||
|
|
Date: Tue, 20 Feb 2024 11:08:13 -0600
|
||
|
|
Subject: [PATCH] test: fix tmpdir in test_cc_apk_configure (#4914)
|
||
|
|
|
||
|
|
cc_apk_configure uses temp_utils.py, which has special logic to return
|
||
|
|
if the user is root that can't be retargeted using our current fixtures.
|
||
|
|
Fix it by setting that tmpdir in the test setup.
|
||
|
|
---
|
||
|
|
tests/unittests/config/test_cc_apk_configure.py | 7 ++++++-
|
||
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/tests/unittests/config/test_cc_apk_configure.py b/tests/unittests/config/test_cc_apk_configure.py
|
||
|
|
index 72ed82242ee..47777b4701a 100644
|
||
|
|
--- a/tests/unittests/config/test_cc_apk_configure.py
|
||
|
|
+++ b/tests/unittests/config/test_cc_apk_configure.py
|
||
|
|
@@ -10,7 +10,7 @@
|
||
|
|
|
||
|
|
import pytest
|
||
|
|
|
||
|
|
-from cloudinit import cloud, helpers, util
|
||
|
|
+from cloudinit import cloud, helpers, temp_utils, util
|
||
|
|
from cloudinit.config import cc_apk_configure
|
||
|
|
from cloudinit.config.schema import (
|
||
|
|
SchemaValidationError,
|
||
|
|
@@ -60,6 +60,11 @@ def setUp(self):
|
||
|
|
self.name = "apk_configure"
|
||
|
|
self.cloud = cloud.Cloud(None, self.paths, None, None, None)
|
||
|
|
self.args = []
|
||
|
|
+ temp_utils._TMPDIR = self.new_root
|
||
|
|
+
|
||
|
|
+ def tearDown(self):
|
||
|
|
+ super().tearDown()
|
||
|
|
+ temp_utils._TMPDIR = None
|
||
|
|
|
||
|
|
@mock.patch(CC_APK + "._write_repositories_file")
|
||
|
|
def test_no_repo_settings(self, m_write_repos):
|