Author: eelco
Date: Tue Oct 12 22:03:50 2010
New Revision: 24254
URL: https://svn.nixos.org/websvn/nix/?rev=24254&sc=1
Log:
* Fix indentation.
Modified:
nixos/trunk/tests/installer.nix
Modified: nixos/trunk/tests/installer.nix
==============================================================================
--- nixos/trunk/tests/installer.nix Tue Oct 12 22:03:37 2010 (r24253)
+++ nixos/trunk/tests/installer.nix Tue Oct 12 22:03:50 2010 (r24254)
@@ -302,37 +302,31 @@
{ 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");
-
- # 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"
- );
-
- 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");
-
- # Connect to it-self.
- #$machine->waitForJob("sshd");
- #$machine->mustSucceed("ssh [email protected] echo hello");
+ ''
+ # 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");
+
+ # 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";
+
+ # Apply the new CD configuration.
+ $machine->mustSucceed("nixos-rebuild test --no-pull");
+
+ # Connect to it-self.
+ #$machine->waitForJob("sshd");
+ #$machine->mustSucceed("ssh [email protected] echo hello");
- $machine->shutdown;
- '';
+ $machine->shutdown;
+ '';
};
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
