diff --git a/easybuild/framework/easyconfig/easyconfig.py b/easybuild/framework/easyconfig/easyconfig.py index 87346ebefc..5691bd160c 100644 --- a/easybuild/framework/easyconfig/easyconfig.py +++ b/easybuild/framework/easyconfig/easyconfig.py @@ -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. diff --git a/test/framework/filetools.py b/test/framework/filetools.py index 58a69f1739..67955f90fd 100644 --- a/test/framework/filetools.py +++ b/test/framework/filetools.py @@ -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