Revert D63689692

Summary:
This diff reverts D63689692
his broke the test build of our oss version in facebookincubator/kernel-patches-daemon@aa0f93f
Similar to D61530831

Reviewed By: chantra

Differential Revision: D64493186

fbshipit-source-id: f16e9ed9108641853b3b808562b160cde7329ec0

Author: generatedunixname89002005232357

tests/test_branch_worker.py

@@ -23,12 +23,6 @@
 
 from freezegun import freeze_time
 from git.exc import GitCommandError
-
-from kernel.kernel_patches_daemon.oss.tests.common.patchwork_mock import (
-    DEFAULT_TEST_RESPONSES,
-    get_default_pw_client,
-    init_pw_responses,
-)
 from kernel_patches_daemon.branch_worker import (
     _is_branch_changed,
     _series_already_applied,
@@ -51,6 +45,12 @@
 from kernel_patches_daemon.status import Status
 from munch import Munch, munchify
 
+from tests.common.patchwork_mock import (
+    DEFAULT_TEST_RESPONSES,
+    get_default_pw_client,
+    init_pw_responses,
+)
+
 from . import read_fixture
 
 

tests/test_patchwork.py

@@ -16,8 +16,12 @@
 from aioresponses import aioresponses
 
 from freezegun import freeze_time
+from kernel_patches_daemon.patchwork import parse_tags, RELEVANT_STATES, Subject, TTL
+from kernel_patches_daemon.status import Status
+from multidict import MultiDict
+from pyre_extensions import none_throws
 
-from kernel.kernel_patches_daemon.oss.tests.common.patchwork_mock import (
+from tests.common.patchwork_mock import (
     DEFAULT_CHECK_CTX,
     DEFAULT_CHECK_CTX_QUERY,
     DEFAULT_FREEZE_DATE,
@@ -28,10 +32,6 @@
     get_dict_key,
     init_pw_responses,
 )
-from kernel_patches_daemon.patchwork import parse_tags, RELEVANT_STATES, Subject, TTL
-from kernel_patches_daemon.status import Status
-from multidict import MultiDict
-from pyre_extensions import none_throws
 
 
 class PatchworkTestCase(unittest.IsolatedAsyncioTestCase):