← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_osutils.py

  • Committer: Martin Pool
  • Date: 2010-02-23 07:43:11 UTC
  • mfrom: (4797.2.20 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: mbp@sourcefrog.net-20100223074311-gnj55xdhrgz9l94e
Merge 2.1 back to trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_osutils.py
1
 
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
309
309
        self.assertEqual("/", osutils.kind_marker(osutils._directory_kind))
310
310
        self.assertEqual("@", osutils.kind_marker("symlink"))
311
311
        self.assertEqual("+", osutils.kind_marker("tree-reference"))
312
 
        self.assertRaises(errors.BzrError, osutils.kind_marker, "unknown")
 
312
        self.assertEqual("", osutils.kind_marker("fifo"))
 
313
        self.assertEqual("", osutils.kind_marker("socket"))
 
314
        self.assertEqual("", osutils.kind_marker("unknown"))
313
315
 
314
316
 
315
317
class TestUmask(tests.TestCaseInTempDir):