From bffb5450e5b666d1328419a77df9ceb327d63ad9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 6 Jan 2010 20:52:05 +0000
Subject: [PATCH] * Perform a full installation and boot from the installed
 system.

svn path=/nixos/trunk/; revision=19274
---
 lib/test-driver/Machine.pm |  7 +++++
 tests/installer.nix        | 64 +++++++++++++++++++++++++++++++++-----
 2 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 0d3cd9c947d8..64f62adab16b 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -337,4 +337,11 @@ sub waitForWindow {
 };
 
 
+sub copyFileFromHost {
+    my ($self, $from, $to) = @_;
+    my $s = `cat $from` or die;
+    $self->mustSucceed("echo '$s' > $to"); # !!! escaping
+}
+
+
 1;
diff --git a/tests/installer.nix b/tests/installer.nix
index 8974121b8241..c44990a34519 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -8,18 +8,50 @@ rec {
     (import ../lib/eval-config.nix {
       inherit nixpkgs system;
       modules =
-        [ ../modules/installer/cd-dvd/installation-cd-minimal.nix
+        [ ../modules/installer/cd-dvd/installation-cd-graphical.nix
           ../modules/testing/test-instrumentation.nix
           { key = "serial"; 
-            boot.kernelParams = [ "console=tty1" "console=ttyS0" ];
+            boot.kernelParams = [ "console=tty1" "console=ttyS0" "panic=1" ];
             boot.loader.grub.timeout = pkgs.lib.mkOverride 0 {} 0;
+            
             # The test cannot access the network, so any sources we
             # need must be included in the ISO.
-            isoImage.storeContents = [ pkgs.hello.src ];
+            isoImage.storeContents =
+              [ pkgs.hello.src
+                pkgs.glibcLocales
+                pkgs.sudo
+                pkgs.docbook5
+              ];
           }
         ];
     }).config.system.build.isoImage;
 
+  # The configuration to install.
+  config = pkgs.writeText "configuration.nix"
+    ''
+      { config, pkgs, modulesPath, ... }:
+
+      { require =
+          [ ./hardware.nix
+            "''${modulesPath}/testing/test-instrumentation.nix"
+          ];
+
+        boot.loader.grub.version = 2;
+        boot.loader.grub.device = "/dev/vda";
+        boot.initrd.kernelModules = [ "ext3" ];
+        boot.kernelParams = [ "console=tty1" "console=ttyS0" "panic=1" ];
+      
+        fileSystems =
+          [ { mountPoint = "/";
+              device = "/dev/disk/by-label/nixos";
+            }
+          ];
+          
+        swapDevices =
+          [ { label = "swap"; } ];
+      }
+    '';
+
   # The test script boots the CD, installs NixOS on an empty hard
   # disk, and then reboot from the hard disk.
   testScript =
@@ -35,8 +67,11 @@ rec {
       $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");
+
       # Test nix-env.
-      $machine->mustSucceed("source /etc/profile");
       $machine->mustFail("hello");
       $machine->mustSucceed("nix-env -i hello");
       $machine->mustSucceed("hello") =~ /Hello, world/
@@ -45,8 +80,8 @@ rec {
       # Partition the disk.
       $machine->mustSucceed(
           "parted /dev/vda mklabel msdos",
-          "parted /dev/vda mkpart primary linux-swap 0 1G",
-          "parted /dev/vda mkpart primary ext2 1G 3G",
+          "parted /dev/vda -- mkpart primary linux-swap 1M 1024M",
+          "parted /dev/vda -- mkpart primary ext2 1024M -1s",
           # It can take udev a moment to create /dev/vda*.
           "udevadm settle",
           "mkswap /dev/vda1 -L swap",
@@ -55,20 +90,33 @@ rec {
           "mount LABEL=nixos /mnt",
       );
 
-      # Create a NixOS configuration.
+      # Create the NixOS configuration.
       $machine->mustSucceed(
           "mkdir -p /mnt/etc/nixos",
           "nixos-hardware-scan > /mnt/etc/nixos/hardware.nix",
       );
 
       my $cfg = $machine->mustSucceed("cat /mnt/etc/nixos/hardware.nix");
-      print STDERR "Result of the hardware scan:$cfg\n";
+      print STDERR "Result of the hardware scan:\n$cfg\n";
 
+      $machine->copyFileFromHost("${config}", "/mnt/etc/nixos/configuration.nix");
+
+      # Perform the installation.
+      $machine->mustSucceed("nixos-install >&2");
+      
       $machine->shutdown;
 
       # Now see if we can boot the installation.
       my $machine = Machine->new({ hda => "harddisk" });
+      
       $machine->mustSucceed("echo hello");
+
+      $machine->mustSucceed("nix-env -i coreutils");
+      $machine->mustSucceed("type -tP ls") =~ /profiles/
+          or die "nix-env failed";
+
+      #$machine->mustSucceed("nixos-rebuild switch");
+
       $machine->shutdown;
     '';