mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-08-25 23:58:57 +02:00
Code Activity

- fixed test_difffiles testsuite for python2.7

Browse Source 
python2.7's difflib slightly changed the format
This commit is contained in:
Marcus Huewe
2010-09-08 12:07:01 +02:00
parent d69bd68ea3
commit 044c678455
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tests/test_difffiles.py
View File

@@ -61,8 +61,8 @@ class TestDiffFiles(OscTestCase):
p = osc.core.Package('.') p = osc.core.Package('.')
p.todo = ['replaced'] p.todo = ['replaced']
exp = """%s exp = """%s
--- replaced\t(revision 2) --- replaced\t(revision 2)
+++ replaced\t(working copy) +++ replaced\t(working copy)
@@ -1,1 +1,1 @@ @@ -1,1 +1,1 @@
-yet another file -yet another file
+foo replaced +foo replaced
@@ -82,8 +82,8 @@ class TestDiffFiles(OscTestCase):
p = osc.core.Package('.') p = osc.core.Package('.')
p.todo = ['foo'] p.todo = ['foo']
exp = """%s exp = """%s
--- foo\t(revision 2) --- foo\t(revision 2)
+++ foo\t(working copy) +++ foo\t(working copy)
@@ -1,1 +1,5 @@ @@ -1,1 +1,5 @@
+<<<<<<< foo.mine +<<<<<<< foo.mine
+This is no test. +This is no test.
@@ -99,8 +99,8 @@ class TestDiffFiles(OscTestCase):
p = osc.core.Package('.') p = osc.core.Package('.')
p.todo = ['nochange'] p.todo = ['nochange']
exp = """%s exp = """%s
--- nochange\t(revision 2) --- nochange\t(revision 2)
+++ nochange\t(working copy) +++ nochange\t(working copy)
@@ -1,1 +1,2 @@ @@ -1,1 +1,2 @@
-This file didn't change. -This file didn't change.
+This file didn't change but +This file didn't change but
@@ -128,8 +128,8 @@ class TestDiffFiles(OscTestCase):
p = osc.core.Package('.') p = osc.core.Package('.')
p.todo = ['nochange', 'somefile'] p.todo = ['nochange', 'somefile']
exp = """%s exp = """%s
--- nochange\t(revision 2) --- nochange\t(revision 2)
+++ nochange\t(working copy) +++ nochange\t(working copy)
@@ -1,1 +1,2 @@ @@ -1,1 +1,2 @@
-This file didn't change. -This file didn't change.
+This file didn't change but +This file didn't change but
@@ -147,8 +147,8 @@ class TestDiffFiles(OscTestCase):
self._change_to_pkg('replaced') self._change_to_pkg('replaced')
p = osc.core.Package('.') p = osc.core.Package('.')
exp = """%s exp = """%s
--- replaced\t(revision 2) --- replaced\t(revision 2)
+++ replaced\t(working copy) +++ replaced\t(working copy)
@@ -1,1 +1,1 @@ @@ -1,1 +1,1 @@
-yet another file -yet another file
+foo replaced +foo replaced
@@ -200,8 +200,8 @@ Binary file 'binary' has changed.
self._change_to_pkg('remote_simple') self._change_to_pkg('remote_simple')
p = osc.core.Package('.') p = osc.core.Package('.')
exp = """%s exp = """%s
--- merge\t(revision 3) --- merge\t(revision 3)
+++ merge\t(working copy) +++ merge\t(working copy)
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
Is it Is it
possible to possible to
@@ -260,8 +260,8 @@ Binary file 'binary' deleted.
self._change_to_pkg('remote_localmodified') self._change_to_pkg('remote_localmodified')
p = osc.core.Package('.') p = osc.core.Package('.')
exp = """%s exp = """%s
--- nochange\t(revision 3) --- nochange\t(revision 3)
+++ nochange\t(working copy) +++ nochange\t(working copy)
@@ -1,1 +1,2 @@ @@ -1,1 +1,2 @@
This file didn't change. This file didn't change.
+oh it does +oh it does