diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-11-07 10:42:54 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2012-11-07 10:42:54 -0500 |
| commit | 21a3cf3186809f9dae387e52e8bd9bc548981003 (patch) | |
| tree | d82d3c05e0f295ad2dda2dee5d0ca5b6ab116b78 /cloudinit/config/cc_resizefs.py | |
| parent | e6d4b76e5e60ff558c247ad76acd27343afe367c (diff) | |
| parent | 8b677bc80a39a0eb1a3cc7989c6bffb959fc7a69 (diff) | |
| download | vyos-cloud-init-21a3cf3186809f9dae387e52e8bd9bc548981003.tar.gz vyos-cloud-init-21a3cf3186809f9dae387e52e8bd9bc548981003.zip | |
test and path cleanups.
1. Remove the usage of the path.join function now that all code should
be going through the util file methods (and they can be mocked out as
needed).
2. Adjust all occurences of the above join function to either not use it
or replace it with the standard os.path.join (which can also be mocked
out as needed)
3. Fix pylint from complaining about the tests folder 'helpers.py' not
being found.
4. Add a pylintrc file that is used instead of the options hidden in the
'run_pylint' tool.
Diffstat (limited to 'cloudinit/config/cc_resizefs.py')
| -rw-r--r-- | cloudinit/config/cc_resizefs.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cloudinit/config/cc_resizefs.py b/cloudinit/config/cc_resizefs.py index e7f27944..b958f332 100644 --- a/cloudinit/config/cc_resizefs.py +++ b/cloudinit/config/cc_resizefs.py @@ -62,7 +62,7 @@ def get_fs_type(st_dev, path, log): raise -def handle(name, cfg, cloud, log, args): +def handle(name, cfg, _cloud, log, args): if len(args) != 0: resize_root = args[0] else: @@ -74,11 +74,10 @@ def handle(name, cfg, cloud, log, args): # TODO(harlowja) is the directory ok to be used?? resize_root_d = util.get_cfg_option_str(cfg, "resize_rootfs_tmp", "/run") - resize_root_d = cloud.paths.join(False, resize_root_d) util.ensure_dir(resize_root_d) # TODO(harlowja): allow what is to be resized to be configurable?? - resize_what = cloud.paths.join(False, "/") + resize_what = "/" with util.ExtendedTemporaryFile(prefix="cloudinit.resizefs.", dir=resize_root_d, delete=True) as tfh: devpth = tfh.name |