diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-04-29 11:23:08 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-04-29 11:23:08 -0400 |
| commit | 0780b3abfb14e8994f6097c5d1d22a92e91bc2f5 (patch) | |
| tree | 08a534e49053403bc77351c5b2096f94e314e538 /tests/unittests/helpers.py | |
| parent | c92f02037afc6b0434c9498904f7d888e00cd55b (diff) | |
| parent | 89fe4242aa3d825ee1b439cc8d184ddf06382086 (diff) | |
| download | vyos-cloud-init-0780b3abfb14e8994f6097c5d1d22a92e91bc2f5.tar.gz vyos-cloud-init-0780b3abfb14e8994f6097c5d1d22a92e91bc2f5.zip | |
Paths: fix instance path if datasource's id has a '/'.
If the datasource's instance id contained a '/' then the instance_id path
would not be as expected under /var/lib/cloud/instances/instance_id.
LP: #1575938
Diffstat (limited to 'tests/unittests/helpers.py')
| -rw-r--r-- | tests/unittests/helpers.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/unittests/helpers.py b/tests/unittests/helpers.py index 7f4b8784..fb9c83a7 100644 --- a/tests/unittests/helpers.py +++ b/tests/unittests/helpers.py @@ -180,13 +180,12 @@ class ResourceUsingTestCase(TestCase): with open(where, 'r') as fh: return fh.read() - def getCloudPaths(self): + def getCloudPaths(self, ds=None): tmpdir = tempfile.mkdtemp() self.addCleanup(shutil.rmtree, tmpdir) - cp = ch.Paths({ - 'cloud_dir': tmpdir, - 'templates_dir': self.resourceLocation(), - }) + cp = ch.Paths({'cloud_dir': tmpdir, + 'templates_dir': self.resourceLocation()}, + ds=ds) return cp |