← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests/shelf_tests.py

  • Committer: Charlie Shepherd
  • Date: 2007-04-04 18:12:00 UTC
  • mto: This revision was merged to the branch mainline in revision 538.
  • Revision ID: masterdriverz@gentoo.org-20070404181200-wqiwytdor9srux2v
Remove all trailing whitespace

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/shelf_tests.py
 
1
import os.path
1
2
from bzrlib.diff import _patch_header_date
2
3
import bzrlib.tests
3
 
import os.path
4
4
 
5
 
try:
6
 
    from bzrlib.plugins.bzrtools.hunk_selector import (
7
 
        ShelveHunkSelector,
8
 
        UnshelveHunkSelector,
9
 
        )
10
 
    from bzrlib.plugins.bzrtools.errors import NoColor
11
 
except ImportError:
12
 
    from bzrtools.hunk_selector import (
13
 
        ShelveHunkSelector,
14
 
        UnshelveHunkSelector,
15
 
        )
16
 
    from bzrtools.errors import NoColor
 
5
from bzrlib.plugins.bzrtools.hunk_selector import (
 
6
    ShelveHunkSelector,
 
7
    UnshelveHunkSelector,
 
8
    )
 
9
from bzrlib.plugins.bzrtools.errors import NoColor
17
10
 
18
11
 
19
12
class ShelfTests(bzrlib.tests.TestCaseWithTransport):
23
16
    DIFF_1 = """--- %(filename)s\t%(old_date)s
24
17
+++ %(filename)s\t%(new_date)s
25
18
@@ -1,4 +1,4 @@
26
 
 
27
 
 
 
19
 
 
20
 
28
21
-hello test world
29
22
+goodbye test world
30
 
 
 
23
 
31
24
"""
32
25
    DIFF_2 = """--- test_file\t%(old_date)s
33
26
+++ test_file\t%(new_date)s
34
27
@@ -1,4 +1,4 @@
35
 
 
36
 
 
 
28
 
 
29
 
37
30
-goodbye test world
38
31
+hello test world
39
 
 
 
32
 
40
33
"""
41
34
    def _check_diff(self, diff=DIFF_1, filename='test_file'):
42
35
        old_tree = self.tree.basis_tree()
43
 
        old_date = _patch_header_date(old_tree, 
44
 
                                      old_tree.inventory.path2id(filename),
45
 
                                      filename)
46
 
        new_date = _patch_header_date(self.tree, 
47
 
                                      self.tree.inventory.path2id(filename),
48
 
                                      filename)
49
 
        keys = { 'filename' : filename , 'old_date': old_date, 
 
36
        old_tree.lock_read()
 
37
        self.tree.lock_read()
 
38
        try:
 
39
            old_date = _patch_header_date(old_tree,
 
40
                                          old_tree.inventory.path2id(filename),
 
41
                                          filename)
 
42
            new_date = _patch_header_date(self.tree,
 
43
                self.tree.inventory.path2id(filename), filename)
 
44
        finally:
 
45
            self.tree.unlock()
 
46
            old_tree.unlock()
 
47
        keys = { 'filename' : filename , 'old_date': old_date,
50
48
                 'new_date': new_date}
51
49
        hdr  = self.DIFF_HEADER % keys
52
50
        diff = diff % keys
55
53
    def _check_shelf(self, idx, diff=DIFF_1, filename='test_file',
56
54
                     new_date=None):
57
55
        old_tree = self.tree.basis_tree()
58
 
        old_date = _patch_header_date(old_tree, 
59
 
                                      old_tree.inventory.path2id(filename),
60
 
                                      filename)
 
56
        old_tree.lock_read()
 
57
        try:
 
58
            old_date = _patch_header_date(old_tree,
 
59
                                          old_tree.inventory.path2id(filename),
 
60
                                          filename)
 
61
        finally:
 
62
            old_tree.unlock()
61
63
        diff = diff % { 'filename' : filename, 'old_date': old_date,
62
64
                        'new_date': new_date}
63
65
        shelf = open(os.path.join(self.tree.basedir,
74
76
    def __test_loop(self, count):
75
77
        self.tree = self.make_branch_and_tree('.')
76
78
        self.__create_and_add_test_file()
77
 
 
78
 
        while count > 0:
79
 
            count -= 1
80
 
 
 
79
        for counter in range(count):
81
80
            # Modify the test file
82
 
            # write in binary mode because on win32 line-endings should be LF
 
81
            # write in binary mode because on win32 line-endings should be
 
82
            # LF
83
83
            f = file('test_file', 'wb')
84
84
            f.write(self.MODIFIED)
85
85
            f.close()
86
86
 
87
87
            self._check_diff()
88
 
            
89
 
            new_date = _patch_header_date(self.tree, 
90
 
                self.tree.inventory.path2id('test_file'), 'test_file')
 
88
 
 
89
            self.tree.lock_write()
 
90
            try:
 
91
                new_date = _patch_header_date(self.tree,
 
92
                    self.tree.inventory.path2id('test_file'), 'test_file')
 
93
            finally:
 
94
                self.tree.unlock()
91
95
 
92
96
            # Shelve the changes
93
97
            self.run_bzr('shelve', '--all', retcode=0)
313
317
 
314
318
    def test_shelf_delete(self):
315
319
        self.tree = self.make_branch_and_tree('.')
316
 
 
317
 
        self.__create_and_add_test_file()
318
 
        self.__create_and_add_test_file(filename='test_file2')
319
 
 
320
 
        # Modify the test files
321
 
        # write in binary mode because on win32 line-endings should be LF
322
 
        f = file('test_file', 'wb')
323
 
        f.write(self.MODIFIED)
324
 
        f.close()
325
 
        f = file('test_file2', 'wb')
326
 
        f.write(self.MODIFIED)
327
 
        f.close()
328
 
        new_date = _patch_header_date(self.tree, 
329
 
            self.tree.inventory.path2id('test_file'), 'test_file')
 
320
        self.tree.lock_write()
 
321
        try:
 
322
            self.__create_and_add_test_file()
 
323
            self.__create_and_add_test_file(filename='test_file2')
 
324
 
 
325
            # Modify the test files
 
326
            # write in binary mode because on win32 line-endings should be LF
 
327
            f = file('test_file', 'wb')
 
328
            f.write(self.MODIFIED)
 
329
            f.close()
 
330
            f = file('test_file2', 'wb')
 
331
            f.write(self.MODIFIED)
 
332
            f.close()
 
333
            new_date = _patch_header_date(self.tree,
 
334
                self.tree.inventory.path2id('test_file'), 'test_file')
 
335
        finally:
 
336
            self.tree.unlock()
330
337
 
331
338
        # Shelve the changes
332
339
        self.run_bzr('shelve', '--all', 'test_file', retcode=0)
421
428
        self.run_bzr('shelf', 'ls', retcode=0)
422
429
 
423
430
        old_tree = self.tree.basis_tree()
424
 
        old_date = _patch_header_date(old_tree, 
425
 
                                      old_tree.inventory.path2id('test_file'),
426
 
                                      'test_file')
427
 
        new_date = _patch_header_date(self.tree, 
428
 
                                      self.tree.inventory.path2id('test_file'),
429
 
                                      'test_file')
 
431
        old_tree.lock_read()
 
432
        self.tree.lock_read()
 
433
        try:
 
434
            old_date = _patch_header_date(old_tree,
 
435
                old_tree.inventory.path2id('test_file'),
 
436
                                          'test_file')
 
437
            new_date = _patch_header_date(self.tree,
 
438
                self.tree.inventory.path2id('test_file'), 'test_file')
 
439
        finally:
 
440
            old_tree.unlock()
 
441
            self.tree.unlock()
430
442
        # Fake a -p0 shelved patch
431
443
        diff = self.DIFF_1 % { 'filename' : 'test_file', 'old_date': old_date,
432
444
                               'new_date' : new_date}
600
612
        f = file('test_file', 'wb')
601
613
        f.write(self.MODIFIED)
602
614
        f.close()
603
 
        stdout, error = self.run_bzr_captured(['shelve', '--all', 
 
615
        stdout, error = self.run_bzr_captured(['shelve', '--all',
604
616
                                               '--no-color'])
605
 
        stdout, error = self.run_bzr_captured(['unshelve', '--all', 
 
617
        stdout, error = self.run_bzr_captured(['unshelve', '--all',
606
618
                                               '--no-color'])