From: Éric Araujo <merwok@netwok.org>
Date: Mon, 6 Jun 2011 18:59:56 +0000 (+0200)
Subject: Use strings instead of sets of lines in packaging.create tests.
X-Git-Tag: v3.3.0a1~2159^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=078368fe4d9955890bf317481483b56752fb4ad2;p=thirdparty%2FPython%2Fcpython.git

Use strings instead of sets of lines in packaging.create tests.

Using sets in tests did not check whether the values were written in the right
section or with the right key.
---

diff --git a/Lib/packaging/tests/test_create.py b/Lib/packaging/tests/test_create.py
index 906ca8fa5398..92a3ea4299f0 100644
--- a/Lib/packaging/tests/test_create.py
+++ b/Lib/packaging/tests/test_create.py
@@ -13,6 +13,7 @@ class CreateTestCase(support.TempdirManager,
                      support.EnvironRestorer,
                      unittest.TestCase):
 
+    maxDiff = None
     restore_environ = ['PLAT']
 
     def setUp(self):
@@ -130,43 +131,45 @@ class CreateTestCase(support.TempdirManager,
         main()
 
         with open(os.path.join(self.wdir, 'setup.cfg'), encoding='utf-8') as fp:
-            lines = set(line.rstrip() for line in fp)
-
-        # FIXME don't use sets
-        self.assertEqual(lines, set(['',
-            '[metadata]',
-            'version = 0.2',
-            'name = pyxfoil',
-            'maintainer = André Espaze',
-            'description = My super Death-scription',
-            '       |barbar is now on the public domain,',
-            '       |ho, baby !',
-            'maintainer_email = andre.espaze@logilab.fr',
-            'home_page = http://www.python-science.org/project/pyxfoil',
-            'download_url = UNKNOWN',
-            'summary = Python bindings for the Xfoil engine',
-            '[files]',
-            'modules = my_lib',
-            '    mymodule',
-            'packages = pyxfoil',
-            '    babar',
-            '    me',
-            'extra_files = Martinique/Lamentin/dady',
-            '    Martinique/Lamentin/mumy',
-            '    Martinique/Lamentin/sys',
-            '    Martinique/Lamentin/bro',
-            '    Pom',
-            '    Flora',
-            '    Alexander',
-            '    setup.py',
-            '    README',
-            '    pyxfoil/fengine.so',
-            'scripts = my_script',
-            '    bin/run',
-            'resources =',
-            '    README.rst = {doc}',
-            '    pyxfoil.1 = {man}',
-        ]))
+            contents = fp.read()
+
+        self.assertEqual(contents, dedent("""\
+            [metadata]
+            name = pyxfoil
+            version = 0.2
+            summary = Python bindings for the Xfoil engine
+            download_url = UNKNOWN
+            home_page = http://www.python-science.org/project/pyxfoil
+            maintainer = André Espaze
+            maintainer_email = andre.espaze@logilab.fr
+            description = My super Death-scription
+                   |barbar is now on the public domain,
+                   |ho, baby !
+
+            [files]
+            packages = pyxfoil
+                babar
+                me
+            modules = my_lib
+                mymodule
+            scripts = my_script
+                bin/run
+            extra_files = Martinique/Lamentin/dady
+                Martinique/Lamentin/mumy
+                Martinique/Lamentin/sys
+                Martinique/Lamentin/bro
+                setup.py
+                README
+                Pom
+                Flora
+                Alexander
+                pyxfoil/fengine.so
+
+            resources =
+                README.rst = {doc}
+                pyxfoil.1 = {man}
+
+            """))
 
     def test_convert_setup_py_to_cfg_with_description_in_readme(self):
         self.write_file((self.wdir, 'setup.py'),
@@ -203,26 +206,29 @@ ho, baby!
         # FIXME Out of memory error.
         main()
         with open(os.path.join(self.wdir, 'setup.cfg'), encoding='utf-8') as fp:
-            lines = set(line.rstrip() for line in fp)
-
-        self.assertEqual(lines, set(['',
-            '[metadata]',
-            'version = 0.2',
-            'name = pyxfoil',
-            'maintainer = André Espaze',
-            'maintainer_email = andre.espaze@logilab.fr',
-            'home_page = http://www.python-science.org/project/pyxfoil',
-            'download_url = UNKNOWN',
-            'summary = Python bindings for the Xfoil engine',
-            'description-file = README.txt',
-            '[files]',
-            'packages = pyxfoil',
-            'extra_files = pyxfoil/fengine.so',
-            '    pyxfoil/babar.so',
-            'resources =',
-            '    README.rst = {doc}',
-            '    pyxfoil.1 = {man}',
-        ]))
+            contents = fp.read()
+
+        self.assertEqual(contents, dedent("""\
+            [metadata]
+            name = pyxfoil
+            version = 0.2
+            summary = Python bindings for the Xfoil engine
+            download_url = UNKNOWN
+            home_page = http://www.python-science.org/project/pyxfoil
+            maintainer = André Espaze
+            maintainer_email = andre.espaze@logilab.fr
+            description-file = README.txt
+
+            [files]
+            packages = pyxfoil
+            extra_files = pyxfoil/fengine.so
+                pyxfoil/babar.so
+
+            resources =
+                README.rst = {doc}
+                pyxfoil.1 = {man}
+
+            """))
 
 
 def test_suite():