Skip to content

Add additional .flake8 ignores and fix S607/B607 #97

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

Merged
merged 7 commits into from
Mar 30, 2022
Merged

Add additional .flake8 ignores and fix S607/B607 #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
33889e2
add flake8 ignores: assert and subprocess
konstruktoid Mar 29, 2022
c767c1a
fix flake8/bandit S607/B607 Test for starting a process with a partia…
konstruktoid Mar 29, 2022
20fc6d0
remove unnecessary VAGRANT_EXE check
konstruktoid Mar 29, 2022
b36b211
Merge branch 'main' into flake8conf
konstruktoid Mar 29, 2022
0e569bf
Merge branch 'main' into flake8conf
konstruktoid Mar 30, 2022
c31455a
Merge branch 'main' into flake8conf
ssbarnea Mar 30, 2022
a36a22d
remove DUO116
konstruktoid Mar 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .flake8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ extend-ignore =
D205,
D400,
D401,
S101, # Use of assert detected
S404, # Consider possible security implications associated with subprocess module
S602, # subprocess call with shell=True identified
S603, # subprocess call

# Allow certain violations in certain files:
per-file-ignores =
Expand Down
31 changes: 15 additions & 16 deletions tests/test_vagrant.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
import vagrant
from vagrant import compat

# location of Vagrant executable
VAGRANT_EXE = vagrant.get_vagrant_executable()

# location of a test file on the created box by provisioning in vm_Vagrantfile
TEST_FILE_PATH = "/home/vagrant/python_vagrant_test_file"
# location of Vagrantfiles used for testing.
Expand All @@ -54,7 +57,6 @@
TEST_DUMMY_BOX_URL = os.path.join(
os.path.dirname(os.path.abspath(__file__)), "tools", f"dummy-{TEST_PROVIDER}.box"
)
# temp dir for testing.


@pytest.fixture(name="test_dir", scope="session")
Expand All @@ -73,7 +75,7 @@ def fixture_test_dir() -> Generator[str, None, None]:
sys.stderr.write("test temp dir: {}\n".format(my_dir))
boxes = list_box_names()
if TEST_BOX_NAME not in boxes:
cmd = f"vagrant box add --provider {TEST_PROVIDER} {TEST_BOX_URL}"
cmd = f"{VAGRANT_EXE} box add --provider {TEST_PROVIDER} {TEST_BOX_URL}"
subprocess.check_call(cmd, shell=True)

yield my_dir
Expand All @@ -95,7 +97,9 @@ def list_box_names():
even if the `Vagrant.box_list()` implementation is broken.
"""
listing = compat.decode(
subprocess.check_output("vagrant box list --machine-readable", shell=True)
subprocess.check_output(
f"{VAGRANT_EXE} box list --machine-readable", shell=True
)
)
box_names = []
for line in listing.splitlines():
Expand Down Expand Up @@ -128,7 +132,7 @@ def fixture_vm_dir(request: FixtureRequest, test_dir) -> Generator[str, None, No
# It is not an error if a VM has already been destroyed.
try:
# Try to destroy any vagrant box that might be running.
subprocess.check_call("vagrant destroy -f", cwd=test_dir, shell=True)
subprocess.check_call(f"{VAGRANT_EXE} destroy -f", cwd=test_dir, shell=True)
except subprocess.CalledProcessError:
pass
finally:
Expand Down Expand Up @@ -245,19 +249,19 @@ def test_vm_status(vm_dir):
assert (
v.NOT_CREATED == v.status()[0].state
), "Before going up status should be vagrant.NOT_CREATED"
command = "vagrant up"
command = f"{VAGRANT_EXE} up"
subprocess.check_call(command, cwd=vm_dir, shell=True)
assert (
v.RUNNING in v.status()[0].state
), "After going up status should be vagrant.RUNNING"

command = "vagrant halt"
command = f"{VAGRANT_EXE} halt"
subprocess.check_call(command, cwd=vm_dir, shell=True)
assert (
v.POWEROFF in v.status()[0].state
), "After halting status should be vagrant.POWEROFF"

command = "vagrant destroy -f"
command = f"{VAGRANT_EXE} destroy -f"
subprocess.check_call(command, cwd=vm_dir, shell=True)
assert (
v.NOT_CREATED in v.status()[0].state
Expand Down Expand Up @@ -296,7 +300,7 @@ def test_vm_config(vm_dir):
"""
v = vagrant.Vagrant(vm_dir)
v.up()
command = "vagrant ssh-config"
command = f"{VAGRANT_EXE} ssh-config"
ssh_config = compat.decode(subprocess.check_output(command, cwd=vm_dir, shell=True))
parsed_config = dict(
line.strip().split(None, 1)
Expand Down Expand Up @@ -451,7 +455,7 @@ def test_boxesvm(test_dir):

# Start fresh with no dummy box
if box_name in list_box_names():
subprocess.check_call(["vagrant", "box", "remove", box_name])
subprocess.check_call([f"{VAGRANT_EXE}", "box", "remove", box_name])

# Test that there is no dummy box listed
assert box_name not in [
Expand Down Expand Up @@ -536,7 +540,7 @@ def test_multivm_config(vm_dir):
"""
v = vagrant.Vagrant(vm_dir, quiet_stdout=False, quiet_stderr=False)
v.up(vm_name=VM_1)
command = "vagrant ssh-config " + VM_1
command = f"{VAGRANT_EXE} ssh-config " + VM_1
ssh_config = compat.decode(subprocess.check_output(command, cwd=vm_dir, shell=True))
parsed_config = dict(
line.strip().split(None, 1)
Expand Down Expand Up @@ -648,13 +652,8 @@ def _execute_command_in_vm(v, command):
Run command via ssh on the test vagrant box. Returns a tuple of the
return code and output of the command.
"""
vagrant_exe = vagrant.get_vagrant_executable()

if not vagrant_exe:
raise RuntimeError(vagrant.VAGRANT_NOT_FOUND_WARNING)

# ignore the fact that this host is not in our known hosts
ssh_command = [vagrant_exe, "ssh", "-c", command]
ssh_command = [VAGRANT_EXE, "ssh", "-c", command]
return compat.decode(subprocess.check_output(ssh_command, cwd=v.root))


Expand Down