saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix linter

Browse source
This commit is contained in:
Daniel A. Wozniak 2024-02-27 15:33:43 -07:00 • committed by Pedro Algarvio
parent a589667304
commit 060a192cc7
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/pytests/unit/test_pillar.py
View file

@ -46,13 +46,13 @@ class MockFileclient:
self.list_states = lambda *x, **y: list_states self.list_states = lambda *x, **y: list_states
# pylint: disable=unused-argument,no-method-argument,method-hidden # pylint: disable=unused-argument,no-method-argument,method-hidden
def cache_file(*args, **kwargs): def cache_file(self, *args, **kwargs):
raise NotImplementedError() raise NotImplementedError()
def get_state(*args, **kwargs): def get_state(self, *args, **kwargs):
raise NotImplementedError() raise NotImplementedError()
def list_states(*args, **kwargs): def list_states(self, *args, **kwargs):
raise NotImplementedError() raise NotImplementedError()
# pylint: enable=unused-argument,no-method-argument,method-hidden # pylint: enable=unused-argument,no-method-argument,method-hidden

12
tests/support/gitfs.py
View file

@ -325,9 +325,9 @@ class GitPillarTestBase(GitTestBase, LoaderModuleMockMixin):
def make_repo(self, root_dir, user=None): def make_repo(self, root_dir, user=None):
log.info("Creating test Git repo....") log.info("Creating test Git repo....")
self.bare_repo = os.path.join(root_dir, "repo.git") self.bare_repo = os.path.join(root_dir, "repo.git")
self.bare_repo_backup = "{}.backup".format(self.bare_repo) self.bare_repo_backup = f"{self.bare_repo}.backup"
self.admin_repo = os.path.join(root_dir, "admin") self.admin_repo = os.path.join(root_dir, "admin")
self.admin_repo_backup = "{}.backup".format(self.admin_repo) self.admin_repo_backup = f"{self.admin_repo}.backup"
for dirname in (self.bare_repo, self.admin_repo): for dirname in (self.bare_repo, self.admin_repo):
shutil.rmtree(dirname, ignore_errors=True) shutil.rmtree(dirname, ignore_errors=True)
@ -491,9 +491,9 @@ class GitPillarTestBase(GitTestBase, LoaderModuleMockMixin):
def make_extra_repo(self, root_dir, user=None): def make_extra_repo(self, root_dir, user=None):
log.info("Creating extra test Git repo....") log.info("Creating extra test Git repo....")
self.bare_extra_repo = os.path.join(root_dir, "extra_repo.git") self.bare_extra_repo = os.path.join(root_dir, "extra_repo.git")
self.bare_extra_repo_backup = "{}.backup".format(self.bare_extra_repo) self.bare_extra_repo_backup = f"{self.bare_extra_repo}.backup"
self.admin_extra_repo = os.path.join(root_dir, "admin_extra") self.admin_extra_repo = os.path.join(root_dir, "admin_extra")
self.admin_extra_repo_backup = "{}.backup".format(self.admin_extra_repo) self.admin_extra_repo_backup = f"{self.admin_extra_repo}.backup"
for dirname in (self.bare_extra_repo, self.admin_extra_repo): for dirname in (self.bare_extra_repo, self.admin_extra_repo):
shutil.rmtree(dirname, ignore_errors=True) shutil.rmtree(dirname, ignore_errors=True)
@ -588,10 +588,10 @@ class GitPillarSSHTestBase(GitPillarTestBase):
""" """
log.info("%s.setUp() started...", self.__class__.__name__) log.info("%s.setUp() started...", self.__class__.__name__)
super().setUp() super().setUp()
root_dir = os.path.expanduser("~{}".format(self.username)) root_dir = os.path.expanduser(f"~{self.username}")
if root_dir.startswith("~"): if root_dir.startswith("~"):
raise AssertionError( raise AssertionError(
"Unable to resolve homedir for user '{}'".format(self.username) f"Unable to resolve homedir for user '{self.username}'"
) )
self.make_repo(root_dir, user=self.username) self.make_repo(root_dir, user=self.username)
self.make_extra_repo(root_dir, user=self.username) self.make_extra_repo(root_dir, user=self.username)