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

Fix virtualType for network-interfaces-scripted #34442

Merged
merged 3 commits into from Feb 1, 2018
Merged

Conversation

rnhmjoj
Copy link
Contributor

@rnhmjoj rnhmjoj commented Jan 31, 2018

Motivation for this change

Fix bug in #34258 and add a test ot prevent it

Things done

"The list of virtual interfaces does not match the expected one:\n",
"Result:\n", "$list\n",
"Expected:\n", "$targetList\n"
);
Copy link
Member

Choose a reason for hiding this comment

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

I would simplify the check to not depend on the output of ip:

$machine->succeed("ip link show tap0");
$machine->succeed("ip link show tun0"); 

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This ways it also checks the type and owner of the interface are set correctly.

@Mic92
Copy link
Member

Mic92 commented Feb 1, 2018

@GrahamcOfBorg test tests.networking.scripted.virtual

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Partial log (click to expand)

error: attribute ‘tests’ in selection path ‘tests.tests.networking.scripted.virtual’ not found

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Partial log (click to expand)

error: attribute 'tests' in selection path 'tests.tests.networking.scripted.virtual' not found

@Mic92
Copy link
Member

Mic92 commented Feb 1, 2018

@GrahamcOfBorg test networking.scripted.virtual

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

machine: exit status 1
syncing
machine: running command: sync
machine: exit status 0
test script finished in 16.48s
cleaning up
killing machine (pid 627)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
/nix/store/p6i9wjv6dvinlm16x2akw00vyjdaf63k-vm-test-run-Virtual-Networking-Scripted

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

machine: exit status 1
syncing
machine: running command: sync
machine: exit status 0
test script finished in 123.26s
cleaning up
killing machine (pid 596)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/tmp/nix-build-vm-test-run-Virtual-Networking-Scripted.drv-0/vde1.ctl': Directory not empty
/nix/store/5656bxiic4x1s83wmpskin0khr0mzhv8-vm-test-run-Virtual-Networking-Scripted

@Mic92 Mic92 merged commit 57d72d4 into NixOS:master Feb 1, 2018
@rnhmjoj
Copy link
Contributor Author

rnhmjoj commented Feb 1, 2018

Woops, I forgot to squash the last commit.

@rnhmjoj rnhmjoj deleted the virtual branch February 23, 2019 09:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants