diff options
| author | Chad Smith <chad.smith@canonical.com> | 2018-06-21 14:32:27 -0600 |
|---|---|---|
| committer | Chad Smith <chad.smith@canonical.com> | 2018-06-21 14:32:27 -0600 |
| commit | ba53ceb5a8a30c10951ec3ac49b8d6ebbe09a524 (patch) | |
| tree | 5b68f0602daea648d48b3dc16809b0d66fb565d1 /tests/unittests/test_runs/test_merge_run.py | |
| parent | 7d1e8976bba629f30da45e814a5a97e2f4b7de3d (diff) | |
| parent | 2d6e4219db73e80c135efd83753f9302f778f08d (diff) | |
| download | vyos-cloud-init-ba53ceb5a8a30c10951ec3ac49b8d6ebbe09a524.tar.gz vyos-cloud-init-ba53ceb5a8a30c10951ec3ac49b8d6ebbe09a524.zip | |
merge from master at 18.3
Diffstat (limited to 'tests/unittests/test_runs/test_merge_run.py')
| -rw-r--r-- | tests/unittests/test_runs/test_merge_run.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/unittests/test_runs/test_merge_run.py b/tests/unittests/test_runs/test_merge_run.py index 5d3f1ca3..d1ac4942 100644 --- a/tests/unittests/test_runs/test_merge_run.py +++ b/tests/unittests/test_runs/test_merge_run.py @@ -25,7 +25,7 @@ class TestMergeRun(helpers.FilesystemMockingTestCase): 'cloud_init_modules': ['write-files'], 'system_info': {'paths': {'run_dir': new_root}} } - ud = self.readResource('user_data.1.txt') + ud = helpers.readResource('user_data.1.txt') cloud_cfg = util.yaml_dumps(cfg) util.ensure_dir(os.path.join(new_root, 'etc', 'cloud')) util.write_file(os.path.join(new_root, 'etc', |