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.

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

systemd-networkd: add DHCPServer test #73505

Merged
merged 1 commit into from Apr 21, 2020
Merged

systemd-networkd: add DHCPServer test #73505

merged 1 commit into from Apr 21, 2020

Conversation

tomfitzhenry
Copy link
Contributor

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

Copy link
Member

@prusnak prusnak left a comment

Choose a reason for hiding this comment

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

Tests are being written in Python now, see #72828

nixos/tests/systemd-networkd-dhcpserver.nix Outdated Show resolved Hide resolved
nixos/tests/systemd-networkd-dhcpserver.nix Show resolved Hide resolved
Copy link
Contributor

@flokli flokli left a comment

Choose a reason for hiding this comment

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

IIRC, there were some problems with useNetworkd in nixos vm tests, due to some assumptions in the testing infrastructure. @fpletz, @arianvp, can you take a look?

nixos/tests/systemd-networkd-dhcpserver.nix Outdated Show resolved Hide resolved
nixos/tests/systemd-networkd-dhcpserver.nix Outdated Show resolved Hide resolved
@tomfitzhenry
Copy link
Contributor Author

IIRC, there were some problems with useNetworkd in nixos vm tests, due to some assumptions in the testing infrastructure.

I did spend an unreasonable amount of time battling with the per-VLAN networks that the test infrastructure adds by default, but eventually found the solution of picking a lexiographically smaller unit file name, which:

  • works, by allowing me to override the default networks
  • is documented in the test
  • is small/simple enough to not impose a large maintenance burden.

@tomfitzhenry
Copy link
Contributor Author

This is blocked on #74207

@flokli flokli mentioned this pull request Dec 6, 2019
10 tasks
@tomfitzhenry
Copy link
Contributor Author

Now that systemd >=243.4 has been included in master, and thus #73504 is fixed, this test no longer needs the workaround for #73504, which had previously blocked this PR's approval and submission. I think this PR is ready for submission.

@flokli flokli added this to To Do in systemd via automation Apr 21, 2020
@flokli
Copy link
Contributor

flokli commented Apr 21, 2020

Thanks for picking this up!

I also did check this against staging/staging-next (which ships with systemd 245.3) to ensure we don't immediately break it again ;-)

LGTM, merged :-)

@flokli flokli merged commit cece19e into NixOS:master Apr 21, 2020
systemd automation moved this from To Do to Done Apr 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
systemd
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

3 participants