components/python/zope-interface/patches/test_sorting.patch
author Jingning Ji <jingning.ji@oracle.com>
Fri, 07 Oct 2016 17:53:08 -0700
changeset 7233 b36e8c8d93ff
permissions -rw-r--r--
23094049 Upgrade zope-interface to 4.1.3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7233
b36e8c8d93ff 23094049 Upgrade zope-interface to 4.1.3
Jingning Ji <jingning.ji@oracle.com>
parents:
diff changeset
     1
As we don't have zope testrunner, test is run directly by python. Therefore 
b36e8c8d93ff 23094049 Upgrade zope-interface to 4.1.3
Jingning Ji <jingning.ji@oracle.com>
parents:
diff changeset
     2
the module name changes as __main__ and causes test_sorting failure.
b36e8c8d93ff 23094049 Upgrade zope-interface to 4.1.3
Jingning Ji <jingning.ji@oracle.com>
parents:
diff changeset
     3
Discussed here https://github.com/zopefoundation/zope.interface/issues/58
b36e8c8d93ff 23094049 Upgrade zope-interface to 4.1.3
Jingning Ji <jingning.ji@oracle.com>
parents:
diff changeset
     4
Will not send upstream.
b36e8c8d93ff 23094049 Upgrade zope-interface to 4.1.3
Jingning Ji <jingning.ji@oracle.com>
parents:
diff changeset
     5
b36e8c8d93ff 23094049 Upgrade zope-interface to 4.1.3
Jingning Ji <jingning.ji@oracle.com>
parents:
diff changeset
     6
--- a/src/zope/interface/tests/test_sorting.py	2016-10-06 16:54:45.526945350 +0000
b36e8c8d93ff 23094049 Upgrade zope-interface to 4.1.3
Jingning Ji <jingning.ji@oracle.com>
parents:
diff changeset
     7
+++ b/src/zope/interface/tests/test_sorting.py	2016-10-06 16:55:21.312625725 +0000
b36e8c8d93ff 23094049 Upgrade zope-interface to 4.1.3
Jingning Ji <jingning.ji@oracle.com>
parents:
diff changeset
     8
@@ -42,9 +42,9 @@
b36e8c8d93ff 23094049 Upgrade zope-interface to 4.1.3
Jingning Ji <jingning.ji@oracle.com>
parents:
diff changeset
     9
         # interfaces with equal names but different modules should sort by
b36e8c8d93ff 23094049 Upgrade zope-interface to 4.1.3
Jingning Ji <jingning.ji@oracle.com>
parents:
diff changeset
    10
         # module name
b36e8c8d93ff 23094049 Upgrade zope-interface to 4.1.3
Jingning Ji <jingning.ji@oracle.com>
parents:
diff changeset
    11
         from zope.interface.tests.m1 import I1 as m1_I1
b36e8c8d93ff 23094049 Upgrade zope-interface to 4.1.3
Jingning Ji <jingning.ji@oracle.com>
parents:
diff changeset
    12
-        l = [I1, m1_I1]
b36e8c8d93ff 23094049 Upgrade zope-interface to 4.1.3
Jingning Ji <jingning.ji@oracle.com>
parents:
diff changeset
    13
+        l = [m1_I1, I1]
b36e8c8d93ff 23094049 Upgrade zope-interface to 4.1.3
Jingning Ji <jingning.ji@oracle.com>
parents:
diff changeset
    14
         l.sort()
b36e8c8d93ff 23094049 Upgrade zope-interface to 4.1.3
Jingning Ji <jingning.ji@oracle.com>
parents:
diff changeset
    15
-        self.assertEqual(l, [m1_I1, I1])
b36e8c8d93ff 23094049 Upgrade zope-interface to 4.1.3
Jingning Ji <jingning.ji@oracle.com>
parents:
diff changeset
    16
+        self.assertEqual(l, [I1, m1_I1])
b36e8c8d93ff 23094049 Upgrade zope-interface to 4.1.3
Jingning Ji <jingning.ji@oracle.com>
parents:
diff changeset
    17
 
b36e8c8d93ff 23094049 Upgrade zope-interface to 4.1.3
Jingning Ji <jingning.ji@oracle.com>
parents:
diff changeset
    18
 def test_suite():
b36e8c8d93ff 23094049 Upgrade zope-interface to 4.1.3
Jingning Ji <jingning.ji@oracle.com>
parents:
diff changeset
    19
     return TestSuite((