← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_alias.py

Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_alias.py
53
53
        tree.add(file_name)
54
54
        tree.commit('added')
55
55
 
56
 
        config.GlobalConfig.from_bytes(u'[ALIASES]\nust=st %s\n' % (file_name,),
57
 
                                       save=True)
 
56
        config.GlobalConfig.from_string(
 
57
            u'[ALIASES]\nust=st %s\n' % (file_name,), save=True)
58
58
 
59
59
        out, err = self.run_bzr('ust')
60
60
        self.assertEquals(err, '')