Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve new linting rules from flake8 #2663

Merged
merged 2 commits into from Oct 6, 2022
Merged

Resolve new linting rules from flake8 #2663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a31d046
address updated bugbear B026 rule within test harness
Sep 29, 2022
db418fd
moving pyminizip requirement to emu
Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion requirements.txt
View file
Open in desktop
Expand Up @@ -26,4 +26,3 @@ dnspython==2.1.0
asyncssh==2.11.0
aioftp~=0.20.0; python_version >= '3.7'
aioftp==0.16.1; python_version < '3.7'
pyminizip==0.2.6
14 changes: 7 additions & 7 deletions tests/conftest.py
View file
Open in desktop
Expand Up @@ -178,15 +178,15 @@ def ability():
def _generate_ability(ability_id=None, *args, **kwargs):
if not ability_id:
ability_id = random.randint(0, 999999)
return Ability(ability_id=ability_id, *args, **kwargs)
return Ability(*args, ability_id=ability_id, **kwargs)

return _generate_ability


@pytest.fixture
def operation():
def _generate_operation(name, agents, adversary, *args, **kwargs):
return Operation(name=name, agents=agents, adversary=adversary, *args, **kwargs)
return Operation(*args, name=name, agents=agents, adversary=adversary, **kwargs)

return _generate_operation

Expand All @@ -210,39 +210,39 @@ def obfuscator(event_loop, data_svc):
@pytest.fixture
def agent():
def _generate_agent(sleep_min, sleep_max, watchdog, *args, **kwargs):
return Agent(sleep_min=sleep_min, sleep_max=sleep_max, watchdog=watchdog, *args, **kwargs)
return Agent(*args, sleep_min=sleep_min, sleep_max=sleep_max, watchdog=watchdog, **kwargs)

return _generate_agent


@pytest.fixture
def link():
def _generate_link(command, paw, ability, executor, *args, **kwargs):
return Link.load(dict(ability=ability, executor=executor, command=command, paw=paw, *args, **kwargs))
return Link.load(dict(*args, ability=ability, executor=executor, command=command, paw=paw, **kwargs))

return _generate_link


@pytest.fixture
def fact():
def _generate_fact(trait, *args, **kwargs):
return Fact(trait=trait, *args, **kwargs)
return Fact(*args, trait=trait, **kwargs)

return _generate_fact


@pytest.fixture
def rule():
def _generate_rule(action, trait, *args, **kwargs):
return Rule(action=action, trait=trait, *args, **kwargs)
return Rule(*args, action=action, trait=trait, **kwargs)

return _generate_rule


@pytest.fixture
def relationship():
def _generate_relationship(source, edge, target, *args, **kwargs):
return Relationship(source=source, edge=edge, target=target, *args, **kwargs)
return Relationship(*args, source=source, edge=edge, target=target, **kwargs)

return _generate_relationship

Expand Down