From 071ad46b55a3cc1c75b8361108d8c14592a6334f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20P=C3=B6hn?= Date: Tue, 4 Jul 2017 13:35:05 +0200 Subject: [PATCH] moved some yaml test files into a separate forlder to avoid conflicts with other test cases --- .../app.with.special.build.params.yml | 0 .../fake.ota.update.yml | 0 .../org.fdroid.fdroid.yml | 0 tests/metadata.TestCase | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) rename tests/{metadata/rewrite-yml => metadata-rewrite-yml}/app.with.special.build.params.yml (100%) rename tests/{metadata/rewrite-yml => metadata-rewrite-yml}/fake.ota.update.yml (100%) rename tests/{metadata/rewrite-yml => metadata-rewrite-yml}/org.fdroid.fdroid.yml (100%) diff --git a/tests/metadata/rewrite-yml/app.with.special.build.params.yml b/tests/metadata-rewrite-yml/app.with.special.build.params.yml similarity index 100% rename from tests/metadata/rewrite-yml/app.with.special.build.params.yml rename to tests/metadata-rewrite-yml/app.with.special.build.params.yml diff --git a/tests/metadata/rewrite-yml/fake.ota.update.yml b/tests/metadata-rewrite-yml/fake.ota.update.yml similarity index 100% rename from tests/metadata/rewrite-yml/fake.ota.update.yml rename to tests/metadata-rewrite-yml/fake.ota.update.yml diff --git a/tests/metadata/rewrite-yml/org.fdroid.fdroid.yml b/tests/metadata-rewrite-yml/org.fdroid.fdroid.yml similarity index 100% rename from tests/metadata/rewrite-yml/org.fdroid.fdroid.yml rename to tests/metadata-rewrite-yml/org.fdroid.fdroid.yml diff --git a/tests/metadata.TestCase b/tests/metadata.TestCase index 712d16f7..ee113287 100755 --- a/tests/metadata.TestCase +++ b/tests/metadata.TestCase @@ -72,7 +72,7 @@ class MetadataTest(unittest.TestCase): # assert rewrite result with open(os.path.join(testdir, 'fake.ota.update.yml'), 'r', encoding='utf-8') as result: - with open('metadata/rewrite-yml/fake.ota.update.yml', 'r', encoding='utf-8') as orig: + with open('metadata-rewrite-yml/fake.ota.update.yml', 'r', encoding='utf-8') as orig: self.maxDiff = None self.assertEqual(result.read(), orig.read()) @@ -93,7 +93,7 @@ class MetadataTest(unittest.TestCase): # assert rewrite result with open(os.path.join(testdir, 'org.fdroid.fdroid.yml'), 'r', encoding='utf-8') as result: - with open('metadata/rewrite-yml/org.fdroid.fdroid.yml', 'r', encoding='utf-8') as orig: + with open('metadata-rewrite-yml/org.fdroid.fdroid.yml', 'r', encoding='utf-8') as orig: self.maxDiff = None self.assertEqual(result.read(), orig.read()) @@ -114,7 +114,7 @@ class MetadataTest(unittest.TestCase): # assert rewrite result with open(os.path.join(testdir, 'app.with.special.build.params.yml'), 'r', encoding='utf-8') as result: - with open('metadata/rewrite-yml/app.with.special.build.params.yml', 'r', encoding='utf-8') as orig: + with open('metadata-rewrite-yml/app.with.special.build.params.yml', 'r', encoding='utf-8') as orig: self.maxDiff = None self.assertEqual(result.read(), orig.read())