Skip to content

fix write_file tests after 'overwrite' argument was renamed to 'always_overwrite' #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mboisson merged 2 commits into from
Nov 16, 2018
Merged

fix write_file tests after 'overwrite' argument was renamed to 'always_overwrite' #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fc02a2
fix write_file tests after 'overwrite' argument was renamed to 'alway…
boegel Nov 16, 2018
abb8aa8
fix typo (allways_overwrite -> always_overwrite)
boegel Nov 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion easybuild/framework/easyconfig/easyconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@ def all_dependencies(self):

return self._all_dependencies

def dump(self, fp, allways_overwrite=True, backup=False):
def dump(self, fp, always_overwrite=True, backup=False):
"""
Dump this easyconfig to file, with the given filename.

Expand Down
10 changes: 5 additions & 5 deletions test/framework/filetools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,18 +561,18 @@ def test_read_write_file(self):
self.assertEqual(ft.read_file(fp), 'blah')

# blind overwriting can be disabled via 'overwrite'
error_pattern = "File exists, not overwriting it without --force: %s" % fp
self.assertErrorRegex(EasyBuildError, error_pattern, ft.write_file, fp, 'blah', overwrite=False)
self.assertErrorRegex(EasyBuildError, error_pattern, ft.write_file, fp, 'blah', overwrite=False, backup=True)
error = "File exists, not overwriting it without --force: %s" % fp
self.assertErrorRegex(EasyBuildError, error, ft.write_file, fp, 'blah', always_overwrite=False)
self.assertErrorRegex(EasyBuildError, error, ft.write_file, fp, 'blah', always_overwrite=False, backup=True)

# use of --force ensuring that file gets written regardless of whether or not it exists already
build_options = {'force': True}
init_config(build_options=build_options)

ft.write_file(fp, 'overwrittenbyforce', overwrite=False)
ft.write_file(fp, 'overwrittenbyforce', always_overwrite=False)
self.assertEqual(ft.read_file(fp), 'overwrittenbyforce')

ft.write_file(fp, 'overwrittenbyforcewithbackup', overwrite=False, backup=True)
ft.write_file(fp, 'overwrittenbyforcewithbackup', always_overwrite=False, backup=True)
self.assertEqual(ft.read_file(fp), 'overwrittenbyforcewithbackup')

# also test behaviour of write_file under --dry-run
Expand Down