chore: flatten test_import_github

nejch · nejch · commit b8ea96cc2051 · 2020-03-18T17:06:47.000-04:00
diff --git a/gitlab/tests/objects/test_projects.py b/gitlab/tests/objects/test_projects.py
@@ -252,6 +252,24 @@ def resp_import_status(url, request):
     return response(200, content, headers, None, 25, request)
 
 
+@urlmatch(
+    scheme="http",
+    netloc="localhost",
+    path="/api/v4/import/github",
+    method="post",
+)
+def resp_import_github(url, request):
+    headers = {"content-type": "application/json"}
+    content = """{
+    "id": 27,
+    "name": "my-repo",
+    "full_path": "/root/my-repo",
+    "full_name": "Administrator / my-repo"
+    }"""
+    content = content.encode("utf-8")
+    return response(200, content, headers, None, 25, request)
+
+
 class TestProjectImport(TestProject):
     @with_httmock(resp_import_project)
     def test_import_project(self):
@@ -264,29 +282,12 @@ def test_refresh_project_import_status(self):
         project_import.refresh()
         self.assertEqual(project_import.import_status, "finished")
 
+    @with_httmock(resp_import_github)
     def test_import_github(self):
-        @urlmatch(
-            scheme="http",
-            netloc="localhost",
-            path="/api/v4/import/github",
-            method="post",
-        )
-        def resp_import_github(url, request):
-            headers = {"content-type": "application/json"}
-            content = """{
-            "id": 27,
-            "name": "my-repo",
-            "full_path": "/root/my-repo",
-            "full_name": "Administrator / my-repo"
-            }"""
-            content = content.encode("utf-8")
-            return response(200, content, headers, None, 25, request)
-
-        with HTTMock(resp_import_github):
-            base_path = "/root"
-            name = "my-repo"
-            ret = self.gl.projects.import_github("githubkey", 1234, base_path, name)
-            self.assertIsInstance(ret, dict)
-            self.assertEqual(ret["name"], name)
-            self.assertEqual(ret["full_path"], "/".join((base_path, name)))
-            self.assertTrue(ret["full_name"].endswith(name))
+        base_path = "/root"
+        name = "my-repo"
+        ret = self.gl.projects.import_github("githubkey", 1234, base_path, name)
+        self.assertIsInstance(ret, dict)
+        self.assertEqual(ret["name"], name)
+        self.assertEqual(ret["full_path"], "/".join((base_path, name)))
+        self.assertTrue(ret["full_name"].endswith(name))
