rename actors

oamg · Nov 14, 2023 · 5b33872 · 5b33872
1 parent 2595961
commit 5b33872
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/...on/actors/dnfconftargetusecustom/actor.py → ...common/actors/applycustomdnfconf/actor.py b/...on/actors/dnfconftargetusecustom/actor.py → ...common/actors/applycustomdnfconf/actor.py
@@ -1,19 +1,19 @@
 from leapp.actors import Actor
-from leapp.libraries.actor import dnfconftargetusecustom
+from leapp.libraries.actor import applycustomdnfconf
 from leapp.tags import ApplicationsPhaseTag, IPUWorkflowTag
 
 
-class DNFConfTargetUseCustom(Actor):
+class ApplyCustomDNFConf(Actor):
     """
     Move /etc/leapp/files/dnf.conf to /etc/dnf/dnf.conf if it exists
 
     An actor in FactsPhase copies this file to the target userspace if present.
     In such case we also want to use the file on the target system.
     """
-    name = "dnf_conf_target_use_custom"
+    name = "apply_custom_dnf_conf"
     consumes = ()
     produces = ()
     tags = (ApplicationsPhaseTag, IPUWorkflowTag)
 
     def process(self):
-        dnfconftargetusecustom.process()
+        applycustomdnfconf.process()
diff --git a/...ustom/libraries/dnfconftargetusecustom.py → ...omdnfconf/libraries/applycustomdnfconf.py b/...ustom/libraries/dnfconftargetusecustom.py → ...omdnfconf/libraries/applycustomdnfconf.py
diff --git a/...stom/tests/test_dnfconftargetusecustom.py → ...mdnfconf/tests/test_applycustomdnfconf.py b/...stom/tests/test_dnfconftargetusecustom.py → ...mdnfconf/tests/test_applycustomdnfconf.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from leapp.libraries.actor import dnfconftargetusecustom
+from leapp.libraries.actor import applycustomdnfconf
 
 
 @pytest.mark.parametrize(
@@ -17,7 +17,7 @@ def test_copy_correct_dnf_conf(monkeypatch, exists, should_move):
     def mocked_run(_):
         run_called[0] = True
 
-    monkeypatch.setattr(dnfconftargetusecustom, 'run', mocked_run)
+    monkeypatch.setattr(applycustomdnfconf, 'run', mocked_run)
 
-    dnfconftargetusecustom.process()
+    applycustomdnfconf.process()
     assert run_called[0] == should_move
diff --git a/...mmon/actors/dnfconfuserspacecopy/actor.py → ...s/copydnfconfintotargetuserspace/actor.py b/...mmon/actors/dnfconfuserspacecopy/actor.py → ...s/copydnfconfintotargetuserspace/actor.py
@@ -1,12 +1,12 @@
 from leapp.actors import Actor
-from leapp.libraries.actor import dnfconfuserspacecopy
+from leapp.libraries.actor import copydnfconfintotargetuserspace
 from leapp.models import TargetUserSpacePreupgradeTasks
 from leapp.tags import FactsPhaseTag, IPUWorkflowTag
 
 
-class DNFConfUserspaceCopy(Actor):
+class CopyDNFConfIntoTargetUserspace(Actor):
     """
-    Copy dnf.conf to target userspace
+    Copy dnf.conf into target userspace
 
     Copies /etc/leapp/files/dnf.conf to target userspace. If it isn't available
     /etc/dnf/dnf.conf is copied instead. This allows specifying a different
@@ -15,10 +15,10 @@ class DNFConfUserspaceCopy(Actor):
     example is incompatible proxy configuration between RHEL7 and RHEL8 DNF
     versions.
     """
-    name = "dnf_conf_userspace_copy"
+    name = "copy_dnf_conf_into_target_userspace"
     consumes = ()
     produces = (TargetUserSpacePreupgradeTasks,)
     tags = (FactsPhaseTag, IPUWorkflowTag)
 
     def process(self):
-        dnfconfuserspacecopy.process()
+        copydnfconfintotargetuserspace.process()
diff --git a/...acecopy/libraries/dnfconfuserspacecopy.py → ...braries/copydnfconfintotargetuserspace.py b/...acecopy/libraries/dnfconfuserspacecopy.py → ...braries/copydnfconfintotargetuserspace.py
diff --git a/...cecopy/tests/test_dnfconfuserspacecopy.py → ...rspace/tests/test_dnfconfuserspacecopy.py b/...cecopy/tests/test_dnfconfuserspacecopy.py → ...rspace/tests/test_dnfconfuserspacecopy.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from leapp.libraries.actor import dnfconfuserspacecopy
+from leapp.libraries.actor import copydnfconfintotargetuserspace
 from leapp.libraries.common.testutils import logger_mocked, produce_mocked
 
 
@@ -14,10 +14,10 @@ def test_copy_correct_dnf_conf(monkeypatch, userspace_conf_exists, expected):
     monkeypatch.setattr(os.path, "exists", lambda _: userspace_conf_exists)
 
     mocked_produce = produce_mocked()
-    monkeypatch.setattr(dnfconfuserspacecopy.api, 'produce', mocked_produce)
-    monkeypatch.setattr(dnfconfuserspacecopy.api, 'current_logger', logger_mocked())
+    monkeypatch.setattr(copydnfconfintotargetuserspace.api, 'produce', mocked_produce)
+    monkeypatch.setattr(copydnfconfintotargetuserspace.api, 'current_logger', logger_mocked())
 
-    dnfconfuserspacecopy.process()
+    copydnfconfintotargetuserspace.process()
 
     assert mocked_produce.called == 1
     assert len(mocked_produce.model_instances) == 1