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
base: 4c07f77124b5
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 1088f059401c
Choose a head ref
  • 6 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 25, 2020

  1. nixos/tests: restructure test driver so that QEMU is actually overriden

    Previously you would be able to override only the QEMU package to be
    used in the test runner. Frankly that doesn't help a lot if you are
    trying to get a graphical session. The graphical session requires the
    option in the NixOS module system to bet set to the correct QEMU
    package.
    
    In this commit I moved most of the test node configuration and
    transformations into the `mkDriver` function (previously called
    `driver`). The motivation was to be able to create a `driver` instance
    with a given QEMU package that will be used consistently througout the
    test expression.
    andir committed Oct 25, 2020
    Copy the full SHA
    04100cd View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    61b09f5 View commit details
    Browse the repository at this point in the history
  3. nixos/tests: fix testDriver reference in runInMachine function

    In a previous commit I broke this as there is no longer one testDriver
    but only a function to generate one based on some QEMU inputs.
    andir committed Oct 25, 2020
    Copy the full SHA
    fa25d84 View commit details
    Browse the repository at this point in the history
  4. nixos/tests: fix runInMachine

    In 5500dc8 we introduced the --keep-vm-state flag and defaulted to that
    flag not being set. This lead to the `runInMachine` tests not longer
    working and that going unnoticed for quite some time now.
    andir committed Oct 25, 2020
    Copy the full SHA
    73635b8 View commit details
    Browse the repository at this point in the history
  5. nixos-build-vms: use the driverInteractive attribute instead

    This reverts commit aab534b & uses the
    driverInteractive attribute for the test driver instead.
    
    This has the same effect but removes the extra module in the
    nixos-build-vms code.
    andir committed Oct 25, 2020
    Copy the full SHA
    d4fb7da View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2020

  1. Merge pull request #101598 from andir/nixos-build-vms-qemu

    nixos/tests: follow-up to the closure reduction PR
    andir committed Oct 26, 2020
    Copy the full SHA
    1088f05 View commit details
    Browse the repository at this point in the history