From: Michael Pöhn <michael.poehn@fsfe.org>
Date: Tue, 4 Jul 2017 11:35:05 +0000 (+0200)
Subject: moved some yaml test files into a separate forlder to avoid conflicts with other... 
X-Git-Tag: 0.8~25^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=071ad46b55a3cc1c75b8361108d8c14592a6334f;p=fdroidserver.git

moved some yaml test files into a separate forlder to avoid conflicts with other test cases
---

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())