← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests/shelf_tests.py

  • Committer: Aaron Bentley
  • Date: 2006-11-30 03:18:39 UTC
  • Revision ID: aaron.bentley@utoronto.ca-20061130031839-q2s2ixzkebyrc9qq
Change recommendation to pybaz 1.5

Show diffs side-by-side

added added

removed removed

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