Move test in a new method

Author: Rémi Lapeyre

Lib/test/test_http_cookiejar.py

@@ -1689,31 +1689,6 @@ def save_and_restore(cj, ignore_discard):
         self.assertEqual(len(new_c), 4)  # 2 of them discarded on save
         self.assertIn("name='foo1', value='bar'", repr(new_c))
 
-        # Check compatibility with curl / wget cookiejar format.
-        # See issue 17164
-        try:
-            expires = int(time.time() + 3600)
-            with open(filename, "w") as f:
-                f.write(MozillaCookieJar.header)
-                f.write("www.foo.com\tFALSE\t/\tFALSE\t%u\tfoo1\tbar\n" %
-                        expires)
-                f.write("www.foo.com\tFALSE\t/\tFALSE\t0\tfoo2\tbar\n")
-                f.write("www.foo.com\tFALSE\t/\tFALSE\t\tfoo3\tbar\n")
-            c = MozillaCookieJar()
-            c.revert(filename)
-            self.assertEqual(len(c), 1)
-            c.revert(filename, ignore_discard = True)
-            self.assertEqual(len(c), 3)
-            c.save(filename, ignore_discard = True)
-            with open(filename, "r") as f:
-                for line in f:
-                    if line == '\n' or line.startswith('#'):
-                        continue
-                    self.assertRegex(line.split('\t')[4], '^\d+$')
-        finally:
-            try: os.unlink(filename)
-            except OSError: pass
-
     def test_netscape_misc(self):
         # Some additional Netscape cookies tests.
         c = CookieJar()
@@ -1836,6 +1811,33 @@ def test_session_cookies(self):
             # we didn't have session cookies in the first place
         self.assertNotEqual(counter["session_before"], 0)
 
+    def test_curl_format(self):
+        # Check compatibility with curl / wget cookiejar format.
+        # See issue 17164
+        filename = test.support.TESTFN
+        try:
+            expires = int(time.time() + 3600)
+            with open(filename, "w") as f:
+                f.write(MozillaCookieJar.header)
+                f.write("www.foo.com\tFALSE\t/\tFALSE\t%u\tfoo1\tbar\n" %
+                        expires)
+                f.write("www.foo.com\tFALSE\t/\tFALSE\t0\tfoo2\tbar\n")
+                f.write("www.foo.com\tFALSE\t/\tFALSE\t\tfoo3\tbar\n")
+            c = MozillaCookieJar()
+            c.revert(filename)
+            self.assertEqual(len(c), 1)
+            c.revert(filename, ignore_discard = True)
+            self.assertEqual(len(c), 3)
+            c.save(filename, ignore_discard = True)
+            with open(filename, "r") as f:
+                for line in f:
+                    if line == '\n' or line.startswith('#'):
+                        continue
+                    self.assertRegex(line.split('\t')[4], '^\d+$')
+        finally:
+            try: os.unlink(filename)
+            except OSError: pass
+
 
 def test_main(verbose=None):
     test.support.run_unittest(