wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

patchutils.py: Move external test resources to a separate directory.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-04-04 00:55:07 +02:00
parent d21860deb6
commit a3bc186a20
2 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
staging/patchutils.py
View File

@ -735,31 +735,13 @@ if __name__ == "__main__":
# Basic tests for read_patch()
class PatchReaderTests(unittest.TestCase):
def test_read(self):
source = ["From be07df750862699f2515c0ac0ceb7a6c25e9458a Mon Sep 17 00:00:00 2001",
"From: =?UTF-8?q?Author=20Name?= <author@email.com>",
"Subject: [PATCH v3] component: Replace arg1 with arg2.",
"",
"Signed-off-by: =?UTF-8?q?Author=20Name?= <author@email.com>",
"Signed-off-by: Other Developer <other@email.com>",
"---",
" test.txt | 2 +-",
" 1 file changed, 1 insertion(+), 1 deletion(-)",
"",
"diff --git a/test.txt b/test.txt",
"index d54375d..0078e66 100644",
"--- a/test.txt", "+++ b/test.txt",
"@@ -1,7 +1,7 @@",
" line1();", " line2();", " line3();",
"-function(arg1);",
"+function(arg2);",
" line5();", " line6();", " line7();",
"-- ",
"2.7.1"]
def test_simple(self):
with open("tests/simple.patch") as fp:
source = fp.read().split("\n")
# Test formatted git patch with author and subject
patchfile = tempfile.NamedTemporaryFile(mode='w+')
patchfile.write("\n".join(source + [""]))
patchfile.write("\n".join(source))
patchfile.flush()
patches = list(read_patch(patchfile.name))
@ -781,7 +763,7 @@ if __name__ == "__main__":
del source[0:10]
self.assertTrue(source[0].startswith("diff --git"))
patchfile = tempfile.NamedTemporaryFile(mode='w+')
patchfile.write("\n".join(source + [""]))
patchfile.write("\n".join(source))
patchfile.flush()
patches = list(read_patch(patchfile.name))
@ -802,7 +784,7 @@ if __name__ == "__main__":
del source[0:2]
self.assertTrue(source[0].startswith("---"))
patchfile = tempfile.NamedTemporaryFile(mode='w+')
patchfile.write("\n".join(source + [""]))
patchfile.write("\n".join(source))
patchfile.flush()
patches = list(read_patch(patchfile.name))
@ -820,7 +802,7 @@ if __name__ == "__main__":
self.assertEqual(lines, source[:11])
# Test with StringIO buffer
fp = StringIO("\n".join(source + [""]))
fp = StringIO("\n".join(source))
patches = list(read_patch("unknown.patch", fp))
self.assertEqual(len(patches), 1)
self.assertEqual(patches[0].patch_author, None)

25
staging/tests/simple.patch Normal file
View File

@ -0,0 +1,25 @@
From be07df750862699f2515c0ac0ceb7a6c25e9458a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Author=20Name?= <author@email.com>
Subject: [PATCH v3] component: Replace arg1 with arg2.
Signed-off-by: =?UTF-8?q?Author=20Name?= <author@email.com>
Signed-off-by: Other Developer <other@email.com>
---
test.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test.txt b/test.txt
index d54375d..0078e66 100644
--- a/test.txt
+++ b/test.txt
@@ -1,7 +1,7 @@
line1();
line2();
line3();
-function(arg1);
+function(arg2);
line5();
line6();
line7();
--
2.7.1