Reorder uuid cli tests and fix comment typo

Author: sumpygump

Lib/test/test_uuid.py

@@ -1182,44 +1182,17 @@ def test_cli_name_required_for_uuid3(self, mock_err):
         self.assertEqual(cm.exception.code, 2)
         self.assertIn("error: Incorrect number of arguments", mock_err.getvalue())
 
-    @mock.patch.object(sys, "argv", [""])
-    def test_cli_uuid4_outputted_with_no_args(self):
-        stdout = io.StringIO()
-        with contextlib.redirect_stdout(stdout):
-            self.uuid.main()
-
-        output = stdout.getvalue().strip()
-        uuid_output = self.uuid.UUID(output)
-
-        # Output uuid should be in the format of uuid4
-        self.assertEqual(output, str(uuid_output))
-        self.assertEqual(uuid_output.version, 4)
-
-    @mock.patch.object(sys, "argv", ["", "-C", "3"])
-    def test_cli_uuid4_outputted_with_count(self):
-        stdout = io.StringIO()
-        with contextlib.redirect_stdout(stdout):
-            self.uuid.main()
-
-        output = stdout.getvalue().strip().splitlines()
-
-        # Check that 3 UUIDs in the format of uuid4 have been generated
-        self.assertEqual(len(output), 3)
-        for o in output:
-            uuid_output = self.uuid.UUID(o)
-            self.assertEqual(uuid_output.version, 4)
-
     @mock.patch.object(sys, "argv",
                        ["", "-u", "uuid3", "-n", "@dns", "-N", "python.org"])
-    def test_cli_uuid3_ouputted_with_valid_namespace_and_name(self):
+    def test_cli_uuid3_outputted_with_valid_namespace_and_name(self):
         stdout = io.StringIO()
         with contextlib.redirect_stdout(stdout):
             self.uuid.main()
 
         output = stdout.getvalue().strip()
         uuid_output = self.uuid.UUID(output)
 
-        # Output should be in the form of uuid5
+        # Output should be in the form of uuid3
         self.assertEqual(output, str(uuid_output))
         self.assertEqual(uuid_output.version, 3)
 
@@ -1238,7 +1211,7 @@ def test_cli_uuid3_with_invalid_namespace(self, mock_err):
                        ["", "-u", "uuid3", "-n",
                         "0d6a16cc-34a7-47d8-b660-214d0ae184d2",
                         "-N", "some.user"])
-    def test_cli_uuid3_ouputted_with_custom_namespace_and_name(self):
+    def test_cli_uuid3_outputted_with_custom_namespace_and_name(self):
         stdout = io.StringIO()
         with contextlib.redirect_stdout(stdout):
             self.uuid.main()
@@ -1250,9 +1223,36 @@ def test_cli_uuid3_ouputted_with_custom_namespace_and_name(self):
         self.assertEqual(output, str(uuid_output))
         self.assertEqual(uuid_output.version, 3)
 
+    @mock.patch.object(sys, "argv", [""])
+    def test_cli_uuid4_outputted_with_no_args(self):
+        stdout = io.StringIO()
+        with contextlib.redirect_stdout(stdout):
+            self.uuid.main()
+
+        output = stdout.getvalue().strip()
+        uuid_output = self.uuid.UUID(output)
+
+        # Output uuid should be in the format of uuid4
+        self.assertEqual(output, str(uuid_output))
+        self.assertEqual(uuid_output.version, 4)
+
+    @mock.patch.object(sys, "argv", ["", "-C", "3"])
+    def test_cli_uuid4_outputted_with_count(self):
+        stdout = io.StringIO()
+        with contextlib.redirect_stdout(stdout):
+            self.uuid.main()
+
+        output = stdout.getvalue().strip().splitlines()
+
+        # Check that 3 UUIDs in the format of uuid4 have been generated
+        self.assertEqual(len(output), 3)
+        for o in output:
+            uuid_output = self.uuid.UUID(o)
+            self.assertEqual(uuid_output.version, 4)
+
     @mock.patch.object(sys, "argv",
                        ["", "-u", "uuid5", "-n", "@dns", "-N", "python.org"])
-    def test_cli_uuid5_ouputted_with_valid_namespace_and_name(self):
+    def test_cli_uuid5_outputted_with_valid_namespace_and_name(self):
         stdout = io.StringIO()
         with contextlib.redirect_stdout(stdout):
             self.uuid.main()