1
=== modified file 'tests/test_generate_diff.py'
2
--- tests/test_generate_diff.py	2019-06-14 09:29:25 +0000
3
+++ tests/test_generate_diff.py	2019-06-14 10:06:42 +0000
4
@@ -15,7 +15,7 @@
5
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
6
16
16
7
17
17
9
18
from StringIO import StringIO
18
from io import BytesIO
10
19
19
11
20
from .. import generate_diff
20
from .. import generate_diff
12
21
from .... import tests
21
from .... import tests
13
@@ -50,11 +50,11 @@
14
50
50
15
51
    def test_mainline_diff(self):
51
    def test_mainline_diff(self):
16
52
        foo, bar, rev1, rev2, rev2_bar, rev3 = self.create_diff_scenario()
52
        foo, bar, rev1, rev2, rev2_bar, rev3 = self.create_diff_scenario()
22
53
        s = StringIO()
53
        buf = BytesIO()
23
54
        generate_diff.mainline_diff(foo.branch, rev1, rev3, s)
54
        generate_diff.mainline_diff(foo.branch, rev1, rev3, buf)
24
55
        self.assertContainsRe(s.getvalue(), '\+b')
55
        self.assertContainsRe(buf.getvalue(), br'\+b')
25
56
        self.assertContainsRe(s.getvalue(), ' a')
56
        self.assertContainsRe(buf.getvalue(), br' a')
26
57
        self.assertNotContainsRe(s.getvalue(), '\+c')
57
        self.assertNotContainsRe(buf.getvalue(), br'\+c')
27
58
58
28
59
    def test_merges(self):
59
    def test_merges(self):
29
60
        foo, bar, rev1, rev2, rev2_bar, rev3 = self.create_diff_scenario()
60
        foo, bar, rev1, rev2, rev2_bar, rev3 = self.create_diff_scenario()
30
@@ -72,26 +72,26 @@
31
72
72
32
73
    def test_diff_ignore_branches(self):
73
    def test_diff_ignore_branches(self):
33
74
        foo, bar, rev1, rev2_bar, rev4 = self.create_unignored_merge_scenario()
74
        foo, bar, rev1, rev2_bar, rev4 = self.create_unignored_merge_scenario()
35
75
        s = StringIO()
75
        buf = BytesIO()
36
76
        generate_diff.diff_ignore_branches(foo.branch, [bar.branch], rev1,
76
        generate_diff.diff_ignore_branches(foo.branch, [bar.branch], rev1,
42
77
                                           rev4, s)
77
                                           rev4, buf)
43
78
        self.assertContainsRe(s.getvalue(), '\+b')
78
        self.assertContainsRe(buf.getvalue(), br'\+b')
44
79
        self.assertContainsRe(s.getvalue(), ' a')
79
        self.assertContainsRe(buf.getvalue(), br' a')
45
80
        self.assertNotContainsRe(s.getvalue(), '\+c')
80
        self.assertNotContainsRe(buf.getvalue(), br'\+c')
46
81
        self.assertContainsRe(s.getvalue(), '\+d')
81
        self.assertContainsRe(buf.getvalue(), br'\+d')
47
82
82
48
83
    def test_diff_ignore_old_revisions(self):
83
    def test_diff_ignore_old_revisions(self):
49
84
        foo, bar, rev1, rev2_bar, rev4 = self.create_unignored_merge_scenario()
84
        foo, bar, rev1, rev2_bar, rev4 = self.create_unignored_merge_scenario()
50
85
        bar.commit('emtpy commit')
85
        bar.commit('emtpy commit')
51
86
        foo.merge_from_branch(bar.branch)
86
        foo.merge_from_branch(bar.branch)
52
87
        rev5 = foo.commit('empty commit')
87
        rev5 = foo.commit('empty commit')
54
88
        s = StringIO()
88
        buf = BytesIO()
55
89
        generate_diff.diff_ignore_branches(foo.branch, [bar.branch], rev1,
89
        generate_diff.diff_ignore_branches(foo.branch, [bar.branch], rev1,
61
90
                                           rev5, s)
90
                                           rev5, buf)
62
91
        self.assertContainsRe(s.getvalue(), '\+b')
91
        self.assertContainsRe(buf.getvalue(), br'\+b')
63
92
        self.assertContainsRe(s.getvalue(), ' a')
92
        self.assertContainsRe(buf.getvalue(), br' a')
64
93
        self.assertNotContainsRe(s.getvalue(), '\+c')
93
        self.assertNotContainsRe(buf.getvalue(), br'\+c')
65
94
        self.assertContainsRe(s.getvalue(), '\+d')
94
        self.assertContainsRe(buf.getvalue(), br'\+d')
66
95
95
67
96
    def test_ignore_heads(self):
96
    def test_ignore_heads(self):
68
97
        foo, bar, rev1, rev2_bar, rev4 = self.create_unignored_merge_scenario()
97
        foo, bar, rev1, rev2_bar, rev4 = self.create_unignored_merge_scenario()
Status:	Merged
Merged at revision:	11
Proposed branch:	lp:~cjwatson/difftacular/py3
Merge into:	lp:difftacular
Diff against target:	68 lines (+18/-18) 1 file modified tests/test_generate_diff.py (+18/-18)
To merge this branch:	bzr merge lp:~cjwatson/difftacular/py3
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Jelmer Vernooij (community)		Approve on 2019-06-14
Canonical Launchpad Engineering	2019-06-14	Pending
Review via email: mp+368822@code.launchpad.net
1	=== modified file 'tests/test_generate_diff.py'
2	--- tests/test_generate_diff.py 2019-06-14 09:29:25 +0000
3	+++ tests/test_generate_diff.py 2019-06-14 10:06:42 +0000
4	@@ -15,7 +15,7 @@
5	15	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA	15	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
6	16		16
7	17		17
9	18	from StringIO import StringIO	18	from io import BytesIO
10	19		19
11	20	from .. import generate_diff	20	from .. import generate_diff
12	21	from .... import tests	21	from .... import tests
13	@@ -50,11 +50,11 @@
14	50		50
15	51	def test_mainline_diff(self):	51	def test_mainline_diff(self):
16	52	foo, bar, rev1, rev2, rev2_bar, rev3 = self.create_diff_scenario()	52	foo, bar, rev1, rev2, rev2_bar, rev3 = self.create_diff_scenario()
22	53	s = StringIO()	53	buf = BytesIO()
23	54	generate_diff.mainline_diff(foo.branch, rev1, rev3, s)	54	generate_diff.mainline_diff(foo.branch, rev1, rev3, buf)
24	55	self.assertContainsRe(s.getvalue(), '\+b')	55	self.assertContainsRe(buf.getvalue(), br'\+b')
25	56	self.assertContainsRe(s.getvalue(), ' a')	56	self.assertContainsRe(buf.getvalue(), br' a')
26	57	self.assertNotContainsRe(s.getvalue(), '\+c')	57	self.assertNotContainsRe(buf.getvalue(), br'\+c')
27	58		58
28	59	def test_merges(self):	59	def test_merges(self):
29	60	foo, bar, rev1, rev2, rev2_bar, rev3 = self.create_diff_scenario()	60	foo, bar, rev1, rev2, rev2_bar, rev3 = self.create_diff_scenario()
30	@@ -72,26 +72,26 @@
31	72		72
32	73	def test_diff_ignore_branches(self):	73	def test_diff_ignore_branches(self):
33	74	foo, bar, rev1, rev2_bar, rev4 = self.create_unignored_merge_scenario()	74	foo, bar, rev1, rev2_bar, rev4 = self.create_unignored_merge_scenario()
35	75	s = StringIO()	75	buf = BytesIO()
36	76	generate_diff.diff_ignore_branches(foo.branch, [bar.branch], rev1,	76	generate_diff.diff_ignore_branches(foo.branch, [bar.branch], rev1,
42	77	rev4, s)	77	rev4, buf)
43	78	self.assertContainsRe(s.getvalue(), '\+b')	78	self.assertContainsRe(buf.getvalue(), br'\+b')
44	79	self.assertContainsRe(s.getvalue(), ' a')	79	self.assertContainsRe(buf.getvalue(), br' a')
45	80	self.assertNotContainsRe(s.getvalue(), '\+c')	80	self.assertNotContainsRe(buf.getvalue(), br'\+c')
46	81	self.assertContainsRe(s.getvalue(), '\+d')	81	self.assertContainsRe(buf.getvalue(), br'\+d')
47	82		82
48	83	def test_diff_ignore_old_revisions(self):	83	def test_diff_ignore_old_revisions(self):
49	84	foo, bar, rev1, rev2_bar, rev4 = self.create_unignored_merge_scenario()	84	foo, bar, rev1, rev2_bar, rev4 = self.create_unignored_merge_scenario()
50	85	bar.commit('emtpy commit')	85	bar.commit('emtpy commit')
51	86	foo.merge_from_branch(bar.branch)	86	foo.merge_from_branch(bar.branch)
52	87	rev5 = foo.commit('empty commit')	87	rev5 = foo.commit('empty commit')
54	88	s = StringIO()	88	buf = BytesIO()
55	89	generate_diff.diff_ignore_branches(foo.branch, [bar.branch], rev1,	89	generate_diff.diff_ignore_branches(foo.branch, [bar.branch], rev1,
61	90	rev5, s)	90	rev5, buf)
62	91	self.assertContainsRe(s.getvalue(), '\+b')	91	self.assertContainsRe(buf.getvalue(), br'\+b')
63	92	self.assertContainsRe(s.getvalue(), ' a')	92	self.assertContainsRe(buf.getvalue(), br' a')
64	93	self.assertNotContainsRe(s.getvalue(), '\+c')	93	self.assertNotContainsRe(buf.getvalue(), br'\+c')
65	94	self.assertContainsRe(s.getvalue(), '\+d')	94	self.assertContainsRe(buf.getvalue(), br'\+d')
66	95		95
67	96	def test_ignore_heads(self):	96	def test_ignore_heads(self):
68	97	foo, bar, rev1, rev2_bar, rev4 = self.create_unignored_merge_scenario()	97	foo, bar, rev1, rev2_bar, rev4 = self.create_unignored_merge_scenario()