Move tests down.

Author: ericsnowcurrently

Lib/test/test_interpreters/test_api.py

@@ -1356,78 +1356,6 @@ def {funcname}():
                 with self.assertRaises(interpreters.NotShareableError):
                     interp.call(defs.spam_returns_arg, arg)
 
-    def test_globals_from_builtins(self):
-        # The builtins  exec(), eval(), globals(), locals(), vars(),
-        # and dir() each runs relative to the target interpreter's
-        # __main__ module, when called directly.  However,
-        # globals(), locals(), and vars() don't work when called
-        # directly so we don't check them.
-        from _frozen_importlib import BuiltinImporter
-        interp = interpreters.create()
-
-        names = interp.call(dir)
-        self.assertEqual(names, [
-            '__builtins__',
-            '__doc__',
-            '__loader__',
-            '__name__',
-            '__package__',
-            '__spec__',
-        ])
-
-        values = {name: interp.call(eval, name)
-                  for name in names if name != '__builtins__'}
-        self.assertEqual(values, {
-            '__name__': '__main__',
-            '__doc__': None,
-            '__spec__': None,  # It wasn't imported, so no module spec?
-            '__package__': None,
-            '__loader__': BuiltinImporter,
-        })
-        with self.assertRaises(ExecutionFailed):
-            interp.call(eval, 'spam'),
-
-        interp.call(exec, f'assert dir() == {names}')
-
-        # Update the interpreter's __main__.
-        interp.prepare_main(spam=42)
-        expected = names + ['spam']
-
-        names = interp.call(dir)
-        self.assertEqual(names, expected)
-
-        value = interp.call(eval, 'spam')
-        self.assertEqual(value, 42)
-
-        interp.call(exec, f'assert dir() == {expected}, dir()')
-
-    def test_globals_from_stateless_func(self):
-        # A stateless func, which doesn't depend on any globals,
-        # doesn't go through pickle, so it runs in __main__.
-        def set_global(name, value):
-            globals()[name] = value
-
-        def get_global(name):
-            return globals().get(name)
-
-        interp = interpreters.create()
-
-        modname = interp.call(get_global, '__name__')
-        self.assertEqual(modname, '__main__')
-
-        res = interp.call(get_global, 'spam')
-        self.assertIsNone(res)
-
-        interp.exec('spam = True')
-        res = interp.call(get_global, 'spam')
-        self.assertTrue(res)
-
-        interp.call(set_global, 'spam', 42)
-        res = interp.call(get_global, 'spam')
-        self.assertEqual(res, 42)
-
-        interp.exec('assert spam == 42, repr(spam)')
-
     def test_raises(self):
         interp = interpreters.create()
         with self.assertRaises(ExecutionFailed):
@@ -1521,6 +1449,78 @@ def test_callable_requires_frame(self):
                     self.assertIsInstance(res, expectedtype)
                     self.assertIn('__builtins__', res)
 
+    def test_globals_from_builtins(self):
+        # The builtins  exec(), eval(), globals(), locals(), vars(),
+        # and dir() each runs relative to the target interpreter's
+        # __main__ module, when called directly.  However,
+        # globals(), locals(), and vars() don't work when called
+        # directly so we don't check them.
+        from _frozen_importlib import BuiltinImporter
+        interp = interpreters.create()
+
+        names = interp.call(dir)
+        self.assertEqual(names, [
+            '__builtins__',
+            '__doc__',
+            '__loader__',
+            '__name__',
+            '__package__',
+            '__spec__',
+        ])
+
+        values = {name: interp.call(eval, name)
+                  for name in names if name != '__builtins__'}
+        self.assertEqual(values, {
+            '__name__': '__main__',
+            '__doc__': None,
+            '__spec__': None,  # It wasn't imported, so no module spec?
+            '__package__': None,
+            '__loader__': BuiltinImporter,
+        })
+        with self.assertRaises(ExecutionFailed):
+            interp.call(eval, 'spam'),
+
+        interp.call(exec, f'assert dir() == {names}')
+
+        # Update the interpreter's __main__.
+        interp.prepare_main(spam=42)
+        expected = names + ['spam']
+
+        names = interp.call(dir)
+        self.assertEqual(names, expected)
+
+        value = interp.call(eval, 'spam')
+        self.assertEqual(value, 42)
+
+        interp.call(exec, f'assert dir() == {expected}, dir()')
+
+    def test_globals_from_stateless_func(self):
+        # A stateless func, which doesn't depend on any globals,
+        # doesn't go through pickle, so it runs in __main__.
+        def set_global(name, value):
+            globals()[name] = value
+
+        def get_global(name):
+            return globals().get(name)
+
+        interp = interpreters.create()
+
+        modname = interp.call(get_global, '__name__')
+        self.assertEqual(modname, '__main__')
+
+        res = interp.call(get_global, 'spam')
+        self.assertIsNone(res)
+
+        interp.exec('spam = True')
+        res = interp.call(get_global, 'spam')
+        self.assertTrue(res)
+
+        interp.call(set_global, 'spam', 42)
+        res = interp.call(get_global, 'spam')
+        self.assertEqual(res, 42)
+
+        interp.exec('assert spam == 42, repr(spam)')
+
     def test_call_in_thread(self):
         interp = interpreters.create()