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

Lots of small fixes to tests and ci stuff #33

Merged
merged 13 commits into from
Feb 24, 2021
Merged

Lots of small fixes to tests and ci stuff #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b982693
tests: Sync up python versions tested between drone and tox
mmlb Feb 19, 2021
3e8b977
tests: comment on EOL'd python 3.5 version
mmlb Feb 19, 2021
5e6eb15
Add shell.nix and .envrc for great good
mmlb Feb 19, 2021
e9b6e0c
ci: run fmt_and_lint via nix
mmlb Feb 19, 2021
4993dc4
test_cli: Replace yapf directives with fmt
mmlb Feb 23, 2021
63f194e
test_cli: Ensure output is always printed
mmlb Feb 23, 2021
c2e9142
test_cli: Sort imports in recommened fashion
mmlb Feb 23, 2021
593c8b4
test_cli: Uncomplicate assert_output
mmlb Feb 23, 2021
983ff9e
test_cli: Test output using regex
mmlb Feb 23, 2021
78654d2
test_cli: Create a fake metadata file instead of mocking open
mmlb Feb 23, 2021
68eed8c
ci: Fix need to ignore E203
mmlb Feb 23, 2021
169b0c5
Configure pycodestyle to effectively ignore line length
mmlb Feb 23, 2021
1479e81
Get rid of unnecessary pylama directives
mmlb Feb 23, 2021
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
8 changes: 4 additions & 4 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ clone:

matrix:
PYTHON_VERSION:
# yes py35 is eol, but tinkerbell/osie still uses old ubuntu and py3.5... sigh
- 3.5
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe the version of python osie is running still uses 3.5 :/

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wat

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wow we need to update those containers already

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

put it back and added a comment

- 3.6
- 3.7
Expand All @@ -12,11 +13,10 @@ matrix:

pipeline:
fmt_and_lint:
image: python:3.8-alpine
image: nixos/nix:2.3.6
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i feel this over complicates the build process as well as gives the assumption that you need nix to run these tests.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can make clear that we don't require nix to run the tests? It does neatly pin the black/pylama(and co) versions which is nice for CI.

commands:
- pip install black==19.3b0 pylama
- black --check --diff .
- pylama --ignore=E203 packetnetworking setup.py
- nix-shell --run "black --check --diff ."
- nix-shell --run "pylama packetnetworking setup.py"

test:
image: python:${PYTHON_VERSION}
Expand Down
2 changes: 2 additions & 0 deletions .envrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
has nix && use nix
dotenv_if_exists
1 change: 0 additions & 1 deletion packetnetworking/distros/debian/bonded.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from ...utils import generate_persistent_names


# pylama:ignore=E501
class DebianBondedNetwork(NetworkBuilder):
def build(self):
if self.network.bonding.link_aggregation in ["bonded", "mlag_ha"]:
Expand Down
1 change: 0 additions & 1 deletion packetnetworking/distros/debian/individual.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from ...utils import generate_persistent_names


# pylama:ignore=E501
class DebianIndividualNetwork(NetworkBuilder):
def build(self):
if self.network.bonding.link_aggregation == "individual":
Expand Down
6 changes: 2 additions & 4 deletions packetnetworking/distros/debian/test_debian_10_bonded.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ def test_debian_10_public_bonded_task_etc_network_interfaces(debian_10_bonded_ne
assert tasks["etc/network/interfaces"] == result


# pylama:ignore=E501
def test_debian_10_private_bonded_task_etc_network_interfaces(debian_10_bonded_network):
"""
When no public ip is assigned, we should see the private ip details in the
Expand Down Expand Up @@ -96,7 +95,7 @@ def test_debian_10_private_bonded_task_etc_network_interfaces(debian_10_bonded_n


def test_debian_10_public_bonded_task_etc_network_interfaces_with_custom_private_ip_space(
debian_10_bonded_network
debian_10_bonded_network,
):
"""Validates /etc/network/interfaces for a public bond"""
subnets = {"private_subnets": ["192.168.5.0/24", "172.16.0.0/12"]}
Expand Down Expand Up @@ -147,7 +146,7 @@ def test_debian_10_public_bonded_task_etc_network_interfaces_with_custom_private


def test_debian_10_private_bonded_task_etc_network_interfaces_with_custom_private_ip_space(
debian_10_bonded_network
debian_10_bonded_network,
):
"""
When no public ip is assigned, we should see the private ip details in the
Expand Down Expand Up @@ -250,7 +249,6 @@ def test_debian_10_etc_hosts_configured(debian_10_bonded_network):
assert tasks["etc/hosts"] == result


# pylama:ignore=E501
def test_debian_10_persistent_interface_names(debian_10_bonded_network):
"""
When using certain operating systems, we want to bypass driver interface name,
Expand Down
10 changes: 4 additions & 6 deletions packetnetworking/distros/debian/test_debian_10_individual.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def _builder(**kwargs):


def test_debian_10_public_individual_task_etc_network_interfaces(
debian_10_individual_network
debian_10_individual_network,
):
"""Validates /etc/network/interfaces for a public bond"""

Expand Down Expand Up @@ -52,7 +52,7 @@ def test_debian_10_public_individual_task_etc_network_interfaces(


def test_debian_10_private_individual_task_etc_network_interfaces(
debian_10_individual_network
debian_10_individual_network,
):
"""
When no public ip is assigned, we should see the private ip details in the
Expand Down Expand Up @@ -82,9 +82,8 @@ def test_debian_10_private_individual_task_etc_network_interfaces(
assert tasks["etc/network/interfaces"] == result


# pylama:ignore=E501
def test_debian_10_public_individual_task_etc_network_interfaces_with_custom_private_ip_space(
debian_10_individual_network
debian_10_individual_network,
):
"""Validates /etc/network/interfaces for a public bond"""
subnets = {"private_subnets": ["192.168.5.0/24", "172.16.0.0/12"]}
Expand Down Expand Up @@ -127,7 +126,7 @@ def test_debian_10_public_individual_task_etc_network_interfaces_with_custom_pri


def test_debian_10_private_individual_task_etc_network_interfaces_with_custom_private_ip_space(
debian_10_individual_network
debian_10_individual_network,
):
"""
When no public ip is assigned, we should see the private ip details in the
Expand Down Expand Up @@ -209,7 +208,6 @@ def test_debian_10_etc_hosts_configured(debian_10_individual_network):
assert tasks["etc/hosts"] == result


# pylama:ignore=E501
def test_debian_10_persistent_interface_names(debian_10_individual_network):
"""
When using certain operating systems, we want to bypass driver interface name,
Expand Down
6 changes: 2 additions & 4 deletions packetnetworking/distros/debian/test_debian_11_bonded.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ def test_debian_11_public_bonded_task_etc_network_interfaces(debian_11_bonded_ne
assert tasks["etc/network/interfaces"] == result


# pylama:ignore=E501
def test_debian_11_private_bonded_task_etc_network_interfaces(debian_11_bonded_network):
"""
When no public ip is assigned, we should see the private ip details in the
Expand Down Expand Up @@ -96,7 +95,7 @@ def test_debian_11_private_bonded_task_etc_network_interfaces(debian_11_bonded_n


def test_debian_11_public_bonded_task_etc_network_interfaces_with_custom_private_ip_space(
debian_11_bonded_network
debian_11_bonded_network,
):
"""Validates /etc/network/interfaces for a public bond"""
subnets = {"private_subnets": ["192.168.5.0/24", "172.16.0.0/12"]}
Expand Down Expand Up @@ -147,7 +146,7 @@ def test_debian_11_public_bonded_task_etc_network_interfaces_with_custom_private


def test_debian_11_private_bonded_task_etc_network_interfaces_with_custom_private_ip_space(
debian_11_bonded_network
debian_11_bonded_network,
):
"""
When no public ip is assigned, we should see the private ip details in the
Expand Down Expand Up @@ -250,7 +249,6 @@ def test_debian_11_etc_hosts_configured(debian_11_bonded_network):
assert tasks["etc/hosts"] == result


# pylama:ignore=E501
def test_debian_11_persistent_interface_names(debian_11_bonded_network):
"""
When using certain operating systems, we want to bypass driver interface name,
Expand Down
10 changes: 4 additions & 6 deletions packetnetworking/distros/debian/test_debian_11_individual.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def _builder(**kwargs):


def test_debian_11_public_individual_task_etc_network_interfaces(
debian_11_individual_network
debian_11_individual_network,
):
"""Validates /etc/network/interfaces for a public bond"""

Expand Down Expand Up @@ -52,7 +52,7 @@ def test_debian_11_public_individual_task_etc_network_interfaces(


def test_debian_11_private_individual_task_etc_network_interfaces(
debian_11_individual_network
debian_11_individual_network,
):
"""
When no public ip is assigned, we should see the private ip details in the
Expand Down Expand Up @@ -82,9 +82,8 @@ def test_debian_11_private_individual_task_etc_network_interfaces(
assert tasks["etc/network/interfaces"] == result


# pylama:ignore=E501
def test_debian_11_public_individual_task_etc_network_interfaces_with_custom_private_ip_space(
debian_11_individual_network
debian_11_individual_network,
):
"""Validates /etc/network/interfaces for a public bond"""
subnets = {"private_subnets": ["192.168.5.0/24", "172.16.0.0/12"]}
Expand Down Expand Up @@ -127,7 +126,7 @@ def test_debian_11_public_individual_task_etc_network_interfaces_with_custom_pri


def test_debian_11_private_individual_task_etc_network_interfaces_with_custom_private_ip_space(
debian_11_individual_network
debian_11_individual_network,
):
"""
When no public ip is assigned, we should see the private ip details in the
Expand Down Expand Up @@ -209,7 +208,6 @@ def test_debian_11_etc_hosts_configured(debian_11_individual_network):
assert tasks["etc/hosts"] == result


# pylama:ignore=E501
def test_debian_11_persistent_interface_names(debian_11_individual_network):
"""
When using certain operating systems, we want to bypass driver interface name,
Expand Down
5 changes: 2 additions & 3 deletions packetnetworking/distros/debian/test_debian_7_bonded.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,8 @@ def test_debian_7_private_bonded_task_etc_network_interfaces(debian_7_bonded_net
assert tasks["etc/network/interfaces"] == result


# pylama:ignore=E501
def test_debian_7_public_bonded_task_etc_network_interfaces_with_custom_private_ip_space(
debian_7_bonded_network
debian_7_bonded_network,
):
"""Validates /etc/network/interfaces for a public bond"""
subnets = {"private_subnets": ["192.168.5.0/24", "172.16.0.0/12"]}
Expand Down Expand Up @@ -147,7 +146,7 @@ def test_debian_7_public_bonded_task_etc_network_interfaces_with_custom_private_


def test_debian_7_private_bonded_task_etc_network_interfaces_with_custom_private_ip_space(
debian_7_bonded_network
debian_7_bonded_network,
):
"""
When no public ip is assigned, we should see the private ip details in the
Expand Down
9 changes: 4 additions & 5 deletions packetnetworking/distros/debian/test_debian_7_individual.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def _builder(**kwargs):


def test_debian_7_public_individual_task_etc_network_interfaces(
debian_7_individual_network
debian_7_individual_network,
):
"""Validates /etc/network/interfaces for a public bond"""

Expand Down Expand Up @@ -52,7 +52,7 @@ def test_debian_7_public_individual_task_etc_network_interfaces(


def test_debian_7_private_individual_task_etc_network_interfaces(
debian_7_individual_network
debian_7_individual_network,
):
"""
When no public ip is assigned, we should see the private ip details in the
Expand Down Expand Up @@ -82,9 +82,8 @@ def test_debian_7_private_individual_task_etc_network_interfaces(
assert tasks["etc/network/interfaces"] == result


# pylama:ignore=E501
def test_debian_7_public_individual_task_etc_network_interfaces_with_custom_private_ip_space(
debian_7_individual_network
debian_7_individual_network,
):
"""Validates /etc/network/interfaces for a public bond"""
subnets = {"private_subnets": ["192.168.5.0/24", "172.16.0.0/12"]}
Expand Down Expand Up @@ -127,7 +126,7 @@ def test_debian_7_public_individual_task_etc_network_interfaces_with_custom_priv


def test_debian_7_private_individual_task_etc_network_interfaces_with_custom_private_ip_space(
debian_7_individual_network
debian_7_individual_network,
):
"""
When no public ip is assigned, we should see the private ip details in the
Expand Down
5 changes: 2 additions & 3 deletions packetnetworking/distros/debian/test_debian_8_bonded.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,8 @@ def test_debian_8_private_bonded_task_etc_network_interfaces(debian_8_bonded_net
assert tasks["etc/network/interfaces"] == result


# pylama:ignore=E501
def test_debian_8_public_bonded_task_etc_network_interfaces_with_custom_private_ip_space(
debian_8_bonded_network
debian_8_bonded_network,
):
"""Validates /etc/network/interfaces for a public bond"""
subnets = {"private_subnets": ["192.168.5.0/24", "172.16.0.0/12"]}
Expand Down Expand Up @@ -147,7 +146,7 @@ def test_debian_8_public_bonded_task_etc_network_interfaces_with_custom_private_


def test_debian_8_private_bonded_task_etc_network_interfaces_with_custom_private_ip_space(
debian_8_bonded_network
debian_8_bonded_network,
):
"""
When no public ip is assigned, we should see the private ip details in the
Expand Down
9 changes: 4 additions & 5 deletions packetnetworking/distros/debian/test_debian_8_individual.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def _builder(**kwargs):


def test_debian_8_public_individual_task_etc_network_interfaces(
debian_8_individual_network
debian_8_individual_network,
):
"""Validates /etc/network/interfaces for a public bond"""

Expand Down Expand Up @@ -52,7 +52,7 @@ def test_debian_8_public_individual_task_etc_network_interfaces(


def test_debian_8_private_individual_task_etc_network_interfaces(
debian_8_individual_network
debian_8_individual_network,
):
"""
When no public ip is assigned, we should see the private ip details in the
Expand Down Expand Up @@ -82,9 +82,8 @@ def test_debian_8_private_individual_task_etc_network_interfaces(
assert tasks["etc/network/interfaces"] == result


# pylama:ignore=E501
def test_debian_8_public_individual_task_etc_network_interfaces_with_custom_private_ip_space(
debian_8_individual_network
debian_8_individual_network,
):
"""Validates /etc/network/interfaces for a public bond"""
subnets = {"private_subnets": ["192.168.5.0/24", "172.16.0.0/12"]}
Expand Down Expand Up @@ -127,7 +126,7 @@ def test_debian_8_public_individual_task_etc_network_interfaces_with_custom_priv


def test_debian_8_private_individual_task_etc_network_interfaces_with_custom_private_ip_space(
debian_8_individual_network
debian_8_individual_network,
):
"""
When no public ip is assigned, we should see the private ip details in the
Expand Down
5 changes: 2 additions & 3 deletions packetnetworking/distros/debian/test_debian_9_bonded.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,8 @@ def test_debian_9_private_bonded_task_etc_network_interfaces(debian_9_bonded_net
assert tasks["etc/network/interfaces"] == result


# pylama:ignore=E501
def test_debian_9_public_bonded_task_etc_network_interfaces_with_custom_private_ip_space(
debian_9_bonded_network
debian_9_bonded_network,
):
"""Validates /etc/network/interfaces for a public bond"""
subnets = {"private_subnets": ["192.168.5.0/24", "172.16.0.0/12"]}
Expand Down Expand Up @@ -147,7 +146,7 @@ def test_debian_9_public_bonded_task_etc_network_interfaces_with_custom_private_


def test_debian_9_private_bonded_task_etc_network_interfaces_with_custom_private_ip_space(
debian_9_bonded_network
debian_9_bonded_network,
):
"""
When no public ip is assigned, we should see the private ip details in the
Expand Down
9 changes: 4 additions & 5 deletions packetnetworking/distros/debian/test_debian_9_individual.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def _builder(**kwargs):


def test_debian_9_public_individual_task_etc_network_interfaces(
debian_9_individual_network
debian_9_individual_network,
):
"""Validates /etc/network/interfaces for a public bond"""

Expand Down Expand Up @@ -52,7 +52,7 @@ def test_debian_9_public_individual_task_etc_network_interfaces(


def test_debian_9_private_individual_task_etc_network_interfaces(
debian_9_individual_network
debian_9_individual_network,
):
"""
When no public ip is assigned, we should see the private ip details in the
Expand Down Expand Up @@ -82,9 +82,8 @@ def test_debian_9_private_individual_task_etc_network_interfaces(
assert tasks["etc/network/interfaces"] == result


# pylama:ignore=E501
def test_debian_9_public_individual_task_etc_network_interfaces_with_custom_private_ip_space(
debian_9_individual_network
debian_9_individual_network,
):
"""Validates /etc/network/interfaces for a public bond"""
subnets = {"private_subnets": ["192.168.5.0/24", "172.16.0.0/12"]}
Expand Down Expand Up @@ -127,7 +126,7 @@ def test_debian_9_public_individual_task_etc_network_interfaces_with_custom_priv


def test_debian_9_private_individual_task_etc_network_interfaces_with_custom_private_ip_space(
debian_9_individual_network
debian_9_individual_network,
):
"""
When no public ip is assigned, we should see the private ip details in the
Expand Down
Loading