Fix Rebase

src/tribler-core/tribler_core/components/tests/test_tribler_components.py

@@ -1,5 +1,3 @@
-from unittest.mock import patch
-
 import pytest
 
 from tribler_core.components.bandwidth_accounting.bandwidth_accounting_component import BandwidthAccountingComponent
@@ -19,7 +17,6 @@
 from tribler_core.components.upgrade import UpgradeComponent
 from tribler_core.components.version_check import VersionCheckComponent
 from tribler_core.components.watch_folder import WatchFolderComponent
-from tribler_core.restapi.rest_manager import RESTManager
 
 pytestmark = pytest.mark.asyncio
 
@@ -50,21 +47,6 @@ def test_session_context_manager(loop, tribler_config):
         Session.current()
 
 
-<<<<<<< main
-async def test_masterkey_component(tribler_config):
-    session = Session(tribler_config, [MasterKeyComponent()])
-    with session:
-        await session.start()
-
-        comp = MasterKeyComponent.instance()
-        assert comp.started.is_set() and not comp.failed
-        assert comp.keypair
-
-        await session.shutdown()
-
-
-=======
->>>>>>> Merge masterkey
 async def test_ipv8_component(tribler_config):
     tribler_config.ipv8.enabled = True
     components = [MasterKeyComponent(), RESTComponent(), Ipv8Component()]