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: 5f6f75fcec8a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6ed6d1af6a02
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 6, 2019

  1. nixos/tests: Fix subprocess launch call for VM monitor 

    This crashed in the create-script case
    @tfc
    tfc committed Nov 6, 2019
    Copy the full SHA
    cf138b4 View commit details

Commits on Nov 7, 2019

  1. nixos/test: Handle undecodable bytes 

    This threw exceptions in boot menus
    @tfc
    tfc authored and Jacek Galowicz committed Nov 7, 2019
    Copy the full SHA
    52ee102 View commit details

  2. Merge pull request #72947 from tfc/boot-test-port-fix 

    Boot test port fix
    @worldofpeace
    worldofpeace authored Nov 7, 2019
    Copy the full SHA
    6ed6d1a View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 nixos/lib/test-driver/test-driver.py
4 changes: 2 additions & 2 deletions nixos/lib/test-driver/test-driver.py
View file
Original file line number Diff line number Diff line change
@@ -601,7 +601,7 @@ def create_socket(path):
stdin=subprocess.DEVNULL,
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
shell=False,
shell=True,
cwd=self.state_dir,
env=environment,
)
@@ -610,7 +610,7 @@ def create_socket(path):

def process_serial_output():
for line in self.process.stdout:
line = line.decode().replace("\r", "").rstrip()
line = line.decode("unicode_escape").replace("\r", "").rstrip()
eprint("{} # {}".format(self.name, line))
self.logger.enqueue({"msg": line, "machine": self.name})