~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_config.py

  • Committer: John Arbash Meinel
  • Date: 2010-09-29 20:18:37 UTC
  • mfrom: (5450 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5452.
  • Revision ID: john@arbash-meinel.com-20100929201837-6d9jhvjokfe3ubvk
Merge bzr.dev 5450 to resolve NEWS and criss-cross merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
778
778
        assertWarning(None)
779
779
 
780
780
 
781
 
class TestGlobalConfigItems(tests.TestCase):
 
781
class TestGlobalConfigItems(tests.TestCaseInTempDir):
782
782
 
783
783
    def test_user_id(self):
784
784
        my_config = config.GlobalConfig.from_string(sample_config_text)