← 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: John Arbash Meinel
  • Date: 2010-02-10 22:52:04 UTC
  • mto: This revision was merged to the branch mainline in revision 5034.
  • Revision ID: john@arbash-meinel.com-20100210225204-gkpyib953g2svoke
https://launchpad.net/bugs/303275
Fix bug #303275, return a kind marker for sockets and fifos.

file_kind() supports returning 'socket' or 'fifo', so kind_marker() should support them
as well. We could just return nothing, but we may as well just match 'ls -F'. No real
harm in doing so.

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.assertEqual("|", osutils.kind_marker("fifo"))
 
313
        self.assertEqual("=", osutils.kind_marker("socket"))
312
314
        self.assertRaises(errors.BzrError, osutils.kind_marker, "unknown")
313
315
 
314
316