Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 49fa4a02b57d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2bb1868f7692
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 11, 2020

  1. test-driver.py: defaulting keepVmState in Machine init 

    ecb73fd introduced a new keepVmState
CLI flag for test-driver.py. This CLI flags gets forwarded to the
Machine class through create_machine.

It created a regression for the boot tests where __main__ end up not
being evaluated. See
#97346 (comment) for
bug report.

Defaulting keepVmState to false when __main__ ends up not being
evaluated.
    @picnoir
    picnoir committed Sep 11, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: ED58F95069B004F5
    Learn about vigilant mode
    Copy the full SHA
    e571b31 View commit details

  2. Merge #97746: test-driver.py: defaulting keepVmState

    @vcunat
    vcunat committed Sep 11, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: ED58F95069B004F5
    Learn about vigilant mode
    Copy the full SHA
    2bb1868 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/lib/test-driver/test-driver.py
2 changes: 1 addition & 1 deletion nixos/lib/test-driver/test-driver.py
View file
Original file line number Diff line number Diff line change
@@ -228,7 +228,7 @@ def create_dir(name: str) -> str:
return path

self.state_dir = os.path.join(tmp_dir, f"vm-state-{self.name}")
if not args["keepVmState"]:
if not args.get("keepVmState", False):
self.cleanup_statedir()
os.makedirs(self.state_dir, mode=0o700, exist_ok=True)
self.shared_dir = create_dir("shared-xchg")