tstest/integration/vms: use an in-process logcatcher #2360
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This adapts the existing in-process logcatcher from tstest/integration into a public type and uses it on the side of testcontrol. This also fixes a bug in the Alpine Linux OpenRC unit that makes every value in `/etc/default/tailscaled` exported into tailscaled's environment, a-la systemd [Service].EnviromentFile. Signed-off-by: Christine Dodrill <xe@tailscale.com>
crawshaw
approved these changes
Jul 8, 2021
| @@ -242,7 +242,7 @@ func fetchFromS3(t *testing.T, fout *os.File, d Distro) bool { | |||
|
|
|||
| // fetchDistro fetches a distribution from the internet if it doesn't already exist locally. It | |||
| // also validates the sha256 sum from a known good hash. | |||
| func fetchDistro(t *testing.T, resultDistro Distro, bins *integration.Binaries) string { | |||
| func (h Harness) fetchDistro(t *testing.T, resultDistro Distro) string { | |||
There was a problem hiding this comment.
Should these be pointer-recievers, i.e. *Harness?
There was a problem hiding this comment.
They aren't mutating the values of the Harness struct and this is non-hot code. I'd prefer to take the "immutability" over speedhacking a test with a pointer receiver.
Xe
pushed a commit
that referenced
this pull request
Jul 9, 2021
To avoid the generated nixos disk images from becoming immune from the GC, I delete the symlink to the nix store at the end of tests. `t.Cleanup` runs at the end of a test. I changed this part of the code to have a separate timer for how long it takes to run NixOS builds, but I did that by using a subtest. This means that it was creating the NixOS image, deleting its symlink and then trying to use that symlink to find the resulting disk image, making the whole thing ineffectual. This was a mistake. I am reverting this change made in #2360 to remove this layer of subtesting. Signed-off-by: Christine Dodrill <xe@tailscale.com>
Xe
pushed a commit
that referenced
this pull request
Jul 9, 2021
To avoid the generated nixos disk images from becoming immune from the GC, I delete the symlink to the nix store at the end of tests. `t.Cleanup` runs at the end of a test. I changed this part of the code to have a separate timer for how long it takes to run NixOS builds, but I did that by using a subtest. This means that it was creating the NixOS image, deleting its symlink and then trying to use that symlink to find the resulting disk image, making the whole thing ineffectual. This was a mistake. I am reverting this change made in #2360 to remove this layer of subtesting. Signed-off-by: Christine Dodrill <xe@tailscale.com>
Xe
pushed a commit
that referenced
this pull request
Jul 9, 2021
To avoid the generated nixos disk images from becoming immune from the GC, I delete the symlink to the nix store at the end of tests. `t.Cleanup` runs at the end of a test. I changed this part of the code to have a separate timer for how long it takes to run NixOS builds, but I did that by using a subtest. This means that it was creating the NixOS image, deleting its symlink and then trying to use that symlink to find the resulting disk image, making the whole thing ineffectual. This was a mistake. I am reverting this change made in #2360 to remove this layer of subtesting. Signed-off-by: Christine Dodrill <xe@tailscale.com>
Xe
pushed a commit
that referenced
this pull request
Jul 9, 2021
To avoid the generated nixos disk images from becoming immune from the GC, I delete the symlink to the nix store at the end of tests. `t.Cleanup` runs at the end of a test. I changed this part of the code to have a separate timer for how long it takes to run NixOS builds, but I did that by using a subtest. This means that it was creating the NixOS image, deleting its symlink and then trying to use that symlink to find the resulting disk image, making the whole thing ineffectual. This was a mistake. I am reverting this change made in #2360 to remove this layer of subtesting. Signed-off-by: Christine Dodrill <xe@tailscale.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adapts the existing in-process logcatcher from tstest/integration
into a public type and uses it on the side of testcontrol. This also
fixes a bug in the Alpine Linux OpenRC unit that makes every value in
/etc/default/tailscaledexported into tailscaled's environment, a-lasystemd [Service].EnviromentFile.
Signed-off-by: Christine Dodrill xe@tailscale.com