From 52a8a529b3a2fd3e2ad5f8c7a40837030ea403e2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 12 Oct 2010 22:03:50 +0000 Subject: [PATCH] * Fix indentation. svn path=/nixos/trunk/; revision=24254 --- tests/installer.nix | 46 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 26 deletions(-) diff --git a/tests/installer.nix b/tests/installer.nix index e8337ebe2bb6..4dcb08f70766 100644 --- a/tests/installer.nix +++ b/tests/installer.nix @@ -302,37 +302,31 @@ in { { inherit iso; nodes = { }; testScript = - '' - # damn, it's costly to evaluate nixos-rebuild (1G of ram) - my $machine = Machine->new({ cdrom => glob("${iso}/iso/*.iso"), qemuFlags => '${qemuNICFlags 1 1} -m 1024' }); - $machine->start; - - # Make sure that we get a login prompt etc. - $machine->mustSucceed("echo hello"); - $machine->waitForJob("tty1"); - $machine->waitForJob("rogue"); - $machine->waitForJob("nixos-manual"); + '' + # damn, it's costly to evaluate nixos-rebuild (1G of ram) + my $machine = Machine->new({ cdrom => glob("${iso}/iso/*.iso"), qemuFlags => '${qemuNICFlags 1 1} -m 1024' }); + $machine->start; - # Make sure that we don't try to download anything. - $machine->stopJob("dhclient"); - $machine->mustSucceed("rm /etc/resolv.conf"); + # Make sure that we don't try to download anything. + $machine->stopJob("dhclient"); + $machine->mustSucceed("rm /etc/resolv.conf"); - # Enable sshd service. - $machine->mustSucceed( - "sed -i 's,^}\$,jobs.sshd.startOn = pkgs.lib.mkOverride 0 \"startup\"; },' /etc/nixos/configuration.nix" - ); + # Enable sshd service. + $machine->mustSucceed( + "sed -i 's,^}\$,jobs.sshd.startOn = pkgs.lib.mkOverride 0 \"startup\"; },' /etc/nixos/configuration.nix" + ); - my $cfg = $machine->mustSucceed("cat /etc/nixos/configuration.nix"); - print STDERR "New CD config:\n$cfg\n"; + my $cfg = $machine->mustSucceed("cat /etc/nixos/configuration.nix"); + print STDERR "New CD config:\n$cfg\n"; - # Apply the new CD configuration. - $machine->mustSucceed("nixos-rebuild test --no-pull"); + # Apply the new CD configuration. + $machine->mustSucceed("nixos-rebuild test --no-pull"); - # Connect to it-self. - #$machine->waitForJob("sshd"); - #$machine->mustSucceed("ssh root@127.0.0.1 echo hello"); + # Connect to it-self. + #$machine->waitForJob("sshd"); + #$machine->mustSucceed("ssh root@127.0.0.1 echo hello"); - $machine->shutdown; - ''; + $machine->shutdown; + ''; }; }