← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_lockdir.py

  • Committer: Patch Queue Manager
  • Date: 2015-12-17 18:39:00 UTC
  • mfrom: (6606.1.2 fix-float)
  • Revision ID: pqm@pqm.ubuntu.com-20151217183900-0719du2uv1kwu3lc
(vila) Inline testtools private method to fix an issue in xenial (the
 private implementation has changed in an backward incompatible way).
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_lockdir.py
1
 
# Copyright (C) 2006-2012, 2016 Canonical Ltd
 
1
# Copyright (C) 2006-2011 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
475
475
        # now the original caller should succeed in unlocking
476
476
        ld1.unlock()
477
477
        # and there should be nothing left over
478
 
        self.assertEqual([], t.list_dir('test_lock'))
 
478
        self.assertEquals([], t.list_dir('test_lock'))
479
479
 
480
480
    def test_failed_lock_leaves_no_trash(self):
481
481
        # if we fail to acquire the lock, we don't leave pending directories
487
487
        t = self.get_transport().clone('test_lock')
488
488
 
489
489
        def check_dir(a):
490
 
            self.assertEqual(a, t.list_dir('.'))
 
490
            self.assertEquals(a, t.list_dir('.'))
491
491
 
492
492
        check_dir([])
493
493
        # when held, that's all we see
512
512
        lf = LockDir(t, 'test_lock')
513
513
        info = lf.peek()
514
514
        formatted_info = info.to_readable_dict()
515
 
        self.assertEqual(
 
515
        self.assertEquals(
516
516
            dict(user='<unknown>', hostname='<unknown>', pid='<unknown>',
517
517
                time_ago='(unknown)'),
518
518
            formatted_info)