boxgrinder-build 0.9.0 → 0.9.1

data/spec/helpers/guestfs-helper-spec.rb

@@ -16,13 +16,20 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
+require 'rubygems'
 require 'boxgrinder-build/helpers/guestfs-helper'
 
 module BoxGrinder
   describe GuestFSHelper do
     before(:each) do
       @log = Logger.new('/dev/null')
-      @helper = GuestFSHelper.new('a/raw/disk', :log => @log)
+      @appliance_config = mock('ApplianceConfig')
+      @appliance_config.stub!(:hardware).and_return(:partitions => {})
+
+      @config = mock('Config')
+      @config.stub!(:dir).and_return(:tmp => '/tmp')
+
+      @helper = GuestFSHelper.new('a/raw/disk', @appliance_config, @config, :log => @log)
     end
 
     describe ".execute" do
@@ -39,11 +46,13 @@ module BoxGrinder
         guestfs.should_receive(:add_drive).with('a/raw/disk')
         guestfs.should_receive(:set_network).with(1)
         guestfs.should_receive(:launch)
-        guestfs.should_receive(:list_partitions).and_return(['/', '/boot'])
+
+        guestfs.should_receive(:list_devices).and_return(['/dev/vda'])
+        guestfs.should_receive(:list_partitions).and_return(['/dev/vda1', '/dev/vda2'])
 
         Guestfs.should_receive(:create).and_return(guestfs)
 
-        @helper.should_receive(:mount_partitions).with(no_args)
+        @helper.should_receive(:mount_partitions).with('/dev/vda', '')
         @helper.execute.should == @helper
       end
 
@@ -60,11 +69,12 @@ module BoxGrinder
         guestfs.should_receive(:add_drive_with_if).with('a/raw/disk', 'ide')
         guestfs.should_receive(:set_network).with(1)
         guestfs.should_receive(:launch)
-        guestfs.should_receive(:list_partitions).and_return(['/', '/boot'])
+        guestfs.should_receive(:list_devices).and_return(['/dev/vda'])
+        guestfs.should_receive(:list_partitions).and_return(['/dev/vda1', '/dev/vda2'])
 
         Guestfs.should_receive(:create).and_return(guestfs)
 
-        @helper.should_receive(:mount_partitions).with(no_args)
+        @helper.should_receive(:mount_partitions).with('/dev/vda', '')
         @helper.execute(nil, :ide_disk => true).should == @helper
       end
 
@@ -85,11 +95,12 @@ module BoxGrinder
         guestfs.should_receive(:add_drive).with('a/raw/disk')
         guestfs.should_receive(:set_network).with(1)
         guestfs.should_receive(:launch)
-        guestfs.should_receive(:list_partitions).and_return(['/', '/boot'])
+        guestfs.should_receive(:list_devices).and_return(['/dev/vda'])
+        guestfs.should_receive(:list_partitions).and_return([])
 
         Guestfs.should_receive(:create).and_return(guestfs)
 
-        @helper.should_receive(:mount_partitions).with(no_args)
+        @helper.should_receive(:mount_partition).with('/dev/vda', '/', '')
         @helper.execute.should == @helper
       end
 
@@ -110,15 +121,18 @@ module BoxGrinder
         guestfs.should_receive(:add_drive).with('a/raw/disk')
         guestfs.should_receive(:set_network).with(1)
         guestfs.should_receive(:launch)
-        guestfs.should_receive(:list_partitions).and_return(['/', '/boot'])
+        guestfs.should_receive(:list_devices).and_return(['/dev/vda'])
+        guestfs.should_receive(:list_partitions).and_return(['/dev/vda1', '/dev/vda2'])
 
         Guestfs.should_receive(:create).and_return(guestfs)
 
-        @helper.should_receive(:mount_partitions).with(no_args)
+        @helper.should_receive(:mount_partitions).with('/dev/vda', '')
         @helper.execute.should == @helper
       end
 
       it "should prepare and run guestfs with one partition" do
+        @appliance_config.stub!(:hardware).and_return(:partitions => {'/' => nil})
+
         guestfs = mock('Guestfs')
         guestfs.should_receive(:set_append).with('noapic')
         guestfs.should_receive(:set_verbose)
@@ -131,12 +145,15 @@ module BoxGrinder
         guestfs.should_receive(:add_drive).with('a/raw/disk')
         guestfs.should_receive(:set_network).with(1)
         guestfs.should_receive(:launch)
-        guestfs.should_receive(:list_partitions).and_return(['/'])
+        guestfs.should_receive(:list_devices).and_return(['/dev/vda'])
+        guestfs.should_receive(:list_partitions).and_return(['/dev/vda1'])
 
         Guestfs.should_receive(:create).and_return(guestfs)
 
-        guestfs.should_receive(:list_partitions).and_return(['/'])
-        @helper.should_receive(:mount_partition).with("/", "/")
+        guestfs.should_receive(:list_partitions).and_return(['/dev/vda1'])
+        @helper.should_receive(:mount_partition).with("/dev/vda1", "/", '')
+
+        guestfs.should_receive(:set_e2label).with("/dev/vda1", "79d3d2d4")
 
         @helper.execute.should == @helper
       end
@@ -159,7 +176,7 @@ module BoxGrinder
         Guestfs.should_receive(:create).and_return(guestfs)
 
         guestfs.should_receive(:list_devices).and_return(['/dev/sda'])
-        @helper.should_receive(:mount_partition).with("/dev/sda", "/")
+        @helper.should_receive(:mount_partition).with("/dev/sda", "/", '')
 
         @helper.execute.should == @helper
       end
@@ -186,62 +203,39 @@ module BoxGrinder
       @helper.mount_partition("/dev/sda", "/")
     end
 
-    it "should mount partitions" do
-      guestfs = mock('Guestfs')
-
-      guestfs.should_receive(:list_partitions).and_return(['/boot', '/'])
-
-      @helper.should_receive(:mount_partition).with('/boot', '/')
-      guestfs.should_receive(:exists).with('/sbin/e2label').and_return(0)
-      guestfs.should_receive(:umount).with('/boot')
-      @helper.should_receive(:mount_partition).with('/', '/')
-      guestfs.should_receive(:exists).with('/sbin/e2label').and_return(1)
-
-      guestfs.should_receive(:list_partitions).and_return(['/boot', '/'])
-      guestfs.should_receive(:sh).with('/sbin/e2label /boot').and_return('/boot')
-      @helper.should_receive(:mount_partition).with('/boot', '/boot')
-
-      @helper.instance_variable_set(:@guestfs, guestfs)
-      @helper.mount_partitions
-    end
-
-    it "should mount partitions with new type of labels" do
-      guestfs = mock('Guestfs')
-
-      guestfs.should_receive(:list_partitions).and_return(['/boot', '/'])
-
-      @helper.should_receive(:mount_partition).with('/boot', '/')
-      guestfs.should_receive(:exists).with('/sbin/e2label').and_return(0)
-      guestfs.should_receive(:umount).with('/boot')
-      @helper.should_receive(:mount_partition).with('/', '/')
-      guestfs.should_receive(:exists).with('/sbin/e2label').and_return(1)
+    describe ".mount_partitions" do
+      it "should mount partitions" do
+        guestfs = mock('Guestfs')
 
-      guestfs.should_receive(:list_partitions).and_return(['/boot', '/'])
-      guestfs.should_receive(:sh).with('/sbin/e2label /boot').and_return('_/boot')
-      @helper.should_receive(:mount_partition).with('/boot', '/boot')
+        @appliance_config.stub!(:hardware).and_return(:partitions => {'/' => nil, '/home' => nil})
+        guestfs.should_receive(:list_partitions).and_return(['/dev/vda1', '/dev/vda2'])
 
-      @helper.instance_variable_set(:@guestfs, guestfs)
-      @helper.mount_partitions
-    end
+        @helper.should_receive(:mount_partition).with('/dev/vda1', '/', '')
+        guestfs.should_receive(:set_e2label).with("/dev/vda1", "79d3d2d4")
+        @helper.should_receive(:mount_partition).with('/dev/vda2', '/home', '')
+        guestfs.should_receive(:set_e2label).with("/dev/vda2", "d5219c04")
 
-    it "should raise when no root partition is found" do
-      guestfs = mock('Guestfs')
+        @helper.instance_variable_set(:@guestfs, guestfs)
+        @helper.mount_partitions('/dev/vda')
+      end
 
-      guestfs.should_receive(:list_partitions).and_return(['/boot', '/'])
+      it "should mount partitions with extended partitions" do
+        guestfs = mock('Guestfs')
 
-      @helper.should_receive(:mount_partition).with('/boot', '/')
-      guestfs.should_receive(:exists).with('/sbin/e2label').and_return(0)
-      guestfs.should_receive(:umount).with('/boot')
-      @helper.should_receive(:mount_partition).with('/', '/')
-      guestfs.should_receive(:exists).with('/sbin/e2label').and_return(0)
-      guestfs.should_receive(:umount).with('/')
+        @appliance_config.stub!(:hardware).and_return(:partitions => {'/' => nil, '/home' => nil, '/var/www' => nil, '/var/mock' => nil})
+        guestfs.should_receive(:list_partitions).and_return(['/dev/vda1', '/dev/vda2', '/dev/vda3', '/dev/vda4', '/dev/vda5'])
 
-      @helper.instance_variable_set(:@guestfs, guestfs)
+        @helper.should_receive(:mount_partition).with('/dev/vda1', '/', '')
+        guestfs.should_receive(:set_e2label).with("/dev/vda1", "79d3d2d4")
+        @helper.should_receive(:mount_partition).with('/dev/vda2', '/home', '')
+        guestfs.should_receive(:set_e2label).with("/dev/vda2", "d5219c04")
+        @helper.should_receive(:mount_partition).with('/dev/vda3', '/var/www', '')
+        guestfs.should_receive(:set_e2label).with("/dev/vda3", "8d86efc1")
+        @helper.should_receive(:mount_partition).with('/dev/vda5', '/var/mock', '')
+        guestfs.should_receive(:set_e2label).with("/dev/vda5", "e7b3b1f2")
 
-      begin
-        @helper.mount_partitions
-      rescue => e
-        e.message.should == "No root partition found for 'disk' disk!"
+        @helper.instance_variable_set(:@guestfs, guestfs)
+        @helper.mount_partitions('/dev/vda')
       end
     end
 
@@ -315,5 +309,28 @@ module BoxGrinder
         @helper.load_selinux_policy
       end
     end
+
+    describe ".umount_partitions" do
+      it "should umount partitions" do
+        guestfs = mock('Guestfs')
+        @helper.instance_variable_set(:@guestfs, guestfs)
+
+        guestfs.should_receive(:list_partitions).and_return(['/dev/vda1', '/dev/vda2'])
+
+        @helper.should_receive(:umount_partition).ordered.with('/dev/vda2')
+        @helper.should_receive(:umount_partition).ordered.with('/dev/vda1')
+
+        @helper.umount_partitions('/dev/vda')
+      end
+    end
+
+    describe ".umount_partition" do
+      it "should umount partition" do
+        guestfs = mock('Guestfs')
+        @helper.instance_variable_set(:@guestfs, guestfs)
+        guestfs.should_receive(:umount).with('/dev/vda1')
+        @helper.umount_partition('/dev/vda1')
+      end
+    end
   end
 end

data/spec/helpers/image-helper-spec.rb

@@ -16,6 +16,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
+require 'rubygems'
 require 'boxgrinder-build/helpers/image-helper'
 
 module BoxGrinder
@@ -48,131 +49,6 @@ module BoxGrinder
       @exec_helper = @helper.instance_variable_get(:@exec_helper)
     end
 
-    it "should mount image with one root partition" do
-      @helper.should_receive(:calculate_disk_offsets).with('disk.raw').and_return(['0'])
-      FileUtils.should_receive(:mkdir_p).with('mount_dir')
-      @helper.should_receive(:get_loop_device).and_return('/dev/loop0')
-      @exec_helper.should_receive(:execute).with("losetup -o 0 /dev/loop0 'disk.raw'")
-      @exec_helper.should_receive(:execute).with('e2label /dev/loop0').and_return('/')
-      @exec_helper.should_receive(:execute).with("mount /dev/loop0 'mount_dir'")
-      @helper.should_receive(:sleep).with(2)
-
-      @helper.mount_image('disk.raw', 'mount_dir').should == {"/"=>"/dev/loop0"}
-    end
-
-    it "should mount image with two partitions with support for new livecd-tools partitions labels starting with '_'" do
-      @helper.should_receive(:calculate_disk_offsets).with('disk.raw').and_return(['322', '562'])
-      FileUtils.should_receive(:mkdir_p).with('mount_dir')
-      @helper.should_receive(:get_loop_device).and_return('/dev/loop0')
-      @exec_helper.should_receive(:execute).with("losetup -o 322 /dev/loop0 'disk.raw'")
-      @exec_helper.should_receive(:execute).with('e2label /dev/loop0').and_return('_/home')
-      @helper.should_receive(:get_loop_device).and_return('/dev/loop1')
-      @exec_helper.should_receive(:execute).with("losetup -o 562 /dev/loop1 'disk.raw'")
-      @exec_helper.should_receive(:execute).with('e2label /dev/loop1').and_return('_/')
-
-      @exec_helper.should_receive(:execute).with("mount /dev/loop1 'mount_dir'")
-      @exec_helper.should_receive(:execute).with("mount /dev/loop0 'mount_dir/home'")
-      @helper.should_receive(:sleep).with(2)
-
-      @helper.mount_image('disk.raw', 'mount_dir').should == {"/"=>"/dev/loop1", "/home"=>"/dev/loop0"}
-    end
-
-    it "should umount the image" do
-      @exec_helper.should_receive(:execute).ordered.with('umount -d /dev/loop0')
-      @exec_helper.should_receive(:execute).ordered.with('umount -d /dev/loop1')
-      FileUtils.should_receive(:rm_rf).with('mount_dir')
-
-      @helper.should_receive(:sleep).with(2)
-
-      @helper.umount_image('disk.raw', 'mount_dir', {"/"=>"/dev/loop1", "/home"=>"/dev/loop0"})
-    end
-
-    it "should get free loop device" do
-      @exec_helper.should_receive(:execute).with('losetup -f 2>&1').and_return("/dev/loop0\n")
-
-      @helper.get_loop_device.should == '/dev/loop0'
-    end
-
-    it "shouldn't get free loop device because there are no free loop devices left" do
-      @exec_helper.should_receive(:execute).with('losetup -f 2>&1').and_raise('boom')
-
-      begin
-        @helper.get_loop_device
-        raise "Shouldn't raise"
-      rescue => e
-        e.message.should == "No free loop devices available, please free at least one. See 'losetup -d' command."
-      end
-    end
-
-    it "should calculate disks offsets" do
-      @helper.should_receive(:get_loop_device).and_return('/dev/loop0')
-      @exec_helper.should_receive(:execute).ordered.with("losetup /dev/loop0 'disk.raw'")
-      @exec_helper.should_receive(:execute).ordered.with("parted /dev/loop0 'unit B print' | grep -e '^ [0-9]' | awk '{ print $2 }'").and_return("0B\n1234B\n")
-      @exec_helper.should_receive(:execute).ordered.with('losetup -d /dev/loop0')
-      @helper.should_receive(:sleep).with(1)
-
-      @helper.calculate_disk_offsets('disk.raw').should == ["0", "1234"]
-    end
-
-    it "should create a new empty disk image" do
-      @exec_helper.should_receive(:execute).with("dd if=/dev/zero of='disk.raw' bs=1 count=0 seek=10240M")
-
-      @helper.create_disk('disk.raw', 10)
-    end
-
-    describe ".create_filesystem" do
-
-      it "should create default filesystem on selected device" do
-        @exec_helper.should_receive(:execute).with("mke2fs -T ext4 -L '/' -F /dev/loop0")
-
-        @helper.create_filesystem('/dev/loop0')
-      end
-
-      it "should create ext4 filesystem on selected device" do
-        @appliance_config.should_receive(:hardware).and_return(
-            OpenCascade.new({
-                                :partitions =>
-                                    {
-                                        '/' => {'size' => 2, 'type' => 'ext3'},
-                                        '/home' => {'size' => 3, 'type' => 'ext3'},
-                                    },
-                                :arch => 'i686',
-                                :base_arch => 'i386',
-                                :cpus => 1,
-                                :memory => 256,
-                            })
-        )
-
-        @exec_helper.should_receive(:execute).with("mke2fs -T ext3 -L '/' -F /dev/loop0")
-
-        @helper.create_filesystem('/dev/loop0')
-      end
-
-      it "should create ext4 filesystem on selected device with a label" do
-        @exec_helper.should_receive(:execute).with("mke2fs -T ext4 -L '/home' -F /dev/loop0")
-
-        @helper.create_filesystem('/dev/loop0', :type => 'ext4', :label => '/home')
-      end
-
-      it "should create ext4 filesystem on selected device with a label" do
-        lambda {
-          @helper.create_filesystem('/dev/loop0', :type => 'ext256', :label => '/home')
-        }.should raise_error(RuntimeError, "Unsupported filesystem specified: ext256")
-      end
-    end
-
-    describe ".sync_files" do
-      it "should sync files" do
-        @exec_helper.should_receive(:execute).with("rsync -Xura from_dir/* 'to_dir'")
-        @helper.sync_files('from_dir', 'to_dir')
-      end
-
-      it "should sync files with a space in path" do
-        @exec_helper.should_receive(:execute).with("rsync -Xura from\\ /dir/* 'to_dir'")
-        @helper.sync_files('from /dir', 'to_dir')
-      end
-    end
-
     describe ".customize" do
       it "should customize the disk image using GuestFS" do
         guestfs = mock('GuestFS')
@@ -182,9 +58,9 @@ module BoxGrinder
         guestfs_helper.should_receive(:customize).with(:ide_disk => false).ordered.and_yield(guestfs, guestfs_helper)
         guestfs_helper.should_receive(:def)
 
-        GuestFSHelper.should_receive(:new).with('disk.raw', :log => @log).and_return(guestfs_helper)
+        GuestFSHelper.should_receive(:new).with(['disk.raw'], @appliance_config, @config, :log => @log).and_return(guestfs_helper)
 
-        @helper.customize('disk.raw') do |guestfs, guestfs_helper|
+        @helper.customize(['disk.raw']) do |guestfs, guestfs_helper|
           guestfs.abc
           guestfs_helper.def
         end
@@ -200,9 +76,9 @@ module BoxGrinder
         guestfs_helper.should_receive(:customize).with(:ide_disk => true).ordered.and_yield(guestfs, guestfs_helper)
         guestfs_helper.should_receive(:def)
 
-        GuestFSHelper.should_receive(:new).with('disk.raw', :log => @log).and_return(guestfs_helper)
+        GuestFSHelper.should_receive(:new).with(['disk.raw'], @appliance_config, @config, :log => @log).and_return(guestfs_helper)
 
-        @helper.customize('disk.raw') do |guestfs, guestfs_helper|
+        @helper.customize(['disk.raw']) do |guestfs, guestfs_helper|
           guestfs.abc
           guestfs_helper.def
         end
@@ -243,6 +119,89 @@ module BoxGrinder
         @helper.convert_disk('a/disk', :vmdk, 'destination')
       end
     end
+
+    describe ".sync_filesystem" do
+      it "should sync filesystems between raw disk with two partitions and a partition image" do
+        guestfs = mock('GuestFS')
+        guestfs_helper = mock(GuestFSHelper)
+
+        guestfs.should_receive(:list_devices).once.times.ordered.and_return(['/dev/vda', '/dev/vdb'])
+        guestfs.should_receive(:list_partitions).once.ordered.and_return(['/dev/vda1', '/dev/vda2'])
+
+        guestfs_helper.should_receive(:mount_partitions).with('/dev/vda')
+        guestfs_helper.should_receive(:load_selinux_policy)
+        guestfs_helper.should_receive(:umount_partitions).with('/dev/vda')
+
+        @appliance_config.stub!(:default_filesystem_type).and_return('ext4')
+
+        guestfs.should_receive(:mkmountpoint).ordered.with('/in')
+        guestfs.should_receive(:mkmountpoint).ordered.with('/out')
+        guestfs.should_receive(:mkmountpoint).ordered.with('/out/in')
+
+        guestfs.should_receive(:mkfs).ordered.with("ext4", "/dev/vdb")
+        guestfs.should_receive(:set_e2label).ordered.with("/dev/vdb", '79d3d2d4')
+
+        guestfs_helper.should_receive(:mount_partition).ordered.with("/dev/vdb", '/out/in')
+        guestfs_helper.should_receive(:mount_partitions).ordered.with('/dev/vda', '/in')
+
+        guestfs.should_receive(:cp_a).ordered.with("/in/", "/out")
+        guestfs.should_receive(:sync).ordered
+
+        guestfs_helper.should_receive(:umount_partition).ordered.with('/dev/vdb')
+        guestfs_helper.should_receive(:umount_partitions).ordered.with('/dev/vda')
+
+        guestfs.should_receive(:rmmountpoint).ordered.with('/out/in')
+        guestfs.should_receive(:rmmountpoint).ordered.with('/out')
+        guestfs.should_receive(:rmmountpoint).ordered.with('/in')
+
+        guestfs_helper.should_receive(:mount_partition).ordered.with("/dev/vdb", '/')
+
+        @helper.sync_filesystem(guestfs, guestfs_helper)
+      end
+
+      it "should sync filesystems between partition image and another partition image" do
+        guestfs = mock('GuestFS')
+        guestfs_helper = mock(GuestFSHelper)
+
+        guestfs.should_receive(:list_devices).once.times.ordered.and_return(['/dev/vda', '/dev/vdb'])
+        guestfs.should_receive(:list_partitions).once.ordered.and_return([])
+
+        guestfs_helper.should_receive(:mount_partition).with('/dev/vda', '/')
+        guestfs_helper.should_receive(:load_selinux_policy)
+        guestfs_helper.should_receive(:umount_partition).with('/dev/vda')
+
+        @appliance_config.stub!(:default_filesystem_type).and_return('ext4')
+
+        guestfs.should_receive(:mkmountpoint).ordered.with('/in')
+        guestfs.should_receive(:mkmountpoint).ordered.with('/out')
+        guestfs.should_receive(:mkmountpoint).ordered.with('/out/in')
+
+        guestfs.should_receive(:mkfs).ordered.with("ext4", "/dev/vdb")
+        guestfs.should_receive(:set_e2label).ordered.with("/dev/vdb", '79d3d2d4')
+
+        guestfs_helper.should_receive(:mount_partition).ordered.with("/dev/vdb", '/out/in')
+        guestfs_helper.should_receive(:mount_partition).ordered.with('/dev/vda', '/in')
+
+        guestfs.should_receive(:cp_a).ordered.with("/in/", "/out")
+        guestfs.should_receive(:sync).ordered
+
+        guestfs_helper.should_receive(:umount_partition).ordered.with('/dev/vdb')
+        guestfs_helper.should_receive(:umount_partition).ordered.with('/dev/vda')
+
+        guestfs.should_receive(:rmmountpoint).ordered.with('/out/in')
+        guestfs.should_receive(:rmmountpoint).ordered.with('/out')
+        guestfs.should_receive(:rmmountpoint).ordered.with('/in')
+
+        guestfs_helper.should_receive(:mount_partition).ordered.with("/dev/vdb", '/')
+
+        @helper.sync_filesystem(guestfs, guestfs_helper)
+      end
+    end
+
+    it "should create a 10GB disk" do
+      @exec_helper.should_receive(:execute).with("dd if=/dev/zero of='/path/disk.raw' bs=1 count=0 seek=10240M")
+      @helper.create_disk('/path/disk.raw', 10)
+    end
   end
 end
 

data/spec/helpers/linux-helper-spec.rb

@@ -16,13 +16,14 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
+require 'rubygems'
 require 'boxgrinder-build/helpers/linux-helper'
 
 module BoxGrinder
   describe LinuxHelper do
 
     before(:each) do
-      @helper = LinuxHelper.new( :log => Logger.new('/dev/null') )
+      @helper = LinuxHelper.new(:log => Logger.new('/dev/null'))
 
       @log = @helper.instance_variable_get(:@log)
     end
@@ -30,13 +31,13 @@ module BoxGrinder
     it "should return valid kernel version" do
       guestfs = mock("guestfs")
       guestfs.should_receive(:ls).with('/lib/modules').and_return(['2.6.33.6-147.fc13.i686'])
-      @helper.kernel_version( guestfs ).should == '2.6.33.6-147.fc13.i686'
+      @helper.kernel_version(guestfs).should == '2.6.33.6-147.fc13.i686'
     end
 
     it "should return valid PAE kernel version" do
       guestfs = mock("guestfs")
       guestfs.should_receive(:ls).with('/lib/modules').and_return(['2.6.33.6-147.fc13.i686.PAE', '2.6.33.6-147.fc13.i686'])
-      @helper.kernel_version( guestfs ).should == '2.6.33.6-147.fc13.i686.PAE'
+      @helper.kernel_version(guestfs).should == '2.6.33.6-147.fc13.i686.PAE'
     end
 
     it "should recreate initramfs kernel image using dracut and add xennet module" do
@@ -48,7 +49,7 @@ module BoxGrinder
       guestfs.should_receive(:exists).with('/sbin/dracut').and_return(1)
       guestfs.should_receive(:sh).with("/sbin/dracut -f -v --add-drivers xennet /boot/initramfs-2.6.33.6-147.fc13.i686.PAE.img 2.6.33.6-147.fc13.i686.PAE")
 
-      @helper.recreate_kernel_image( guestfs, ['xennet'] )
+      @helper.recreate_kernel_image(guestfs, ['xennet'])
     end
 
     it "should recreate initrd kernel image using mkinitrd and add xenblk and xennet module" do
@@ -60,9 +61,25 @@ module BoxGrinder
       guestfs.should_receive(:exists).with('/sbin/dracut').and_return(0)
       guestfs.should_receive(:sh).with("/sbin/mkinitrd -f -v --preload=xenblk --preload=xennet /boot/initrd-2.6.33.6-147.fc13.i686.PAE.img 2.6.33.6-147.fc13.i686.PAE")
 
-      @helper.recreate_kernel_image( guestfs, ['xenblk', 'xennet'] )
+      @helper.recreate_kernel_image(guestfs, ['xenblk', 'xennet'])
     end
 
+    describe ".partition_mount_points" do
+      it "should return ['/', '/home']" do
+        hash = {"/"=>{"size"=>2, "type"=>"ext3"}, "/home"=>{"size"=>2, "type"=>"ext3"}}
+        @helper.partition_mount_points(hash).should == ['/', '/home']
+      end
+
+      it "should return ['/', '/ubrc', '/tmp-config', '/tmp-eventlog']" do
+        hash = {"/tmp-eventlog"=>{"size"=>0.01, "type"=>"ext3"}, "/"=>{"size"=>2, "type"=>"ext3"}, "/ubrc"=>{"size"=>0.02, "type"=>"ext3"}, "/tmp-config"=>{"size"=>0.26}}
+        @helper.partition_mount_points(hash).should == ["/", "/ubrc", "/tmp-config", "/tmp-eventlog"]
+      end
+
+      it "should return ['/', '/tmp-config', '/tmp-eventlog', '/var/www']" do
+        hash = {"/tmp-eventlog"=>{}, "/"=>{}, "/var/www"=>{}, "/tmp-config"=>{}}
+        @helper.partition_mount_points(hash).should == ['/', '/tmp-config', '/tmp-eventlog', '/var/www']
+      end
+    end
   end
 end
 

data/spec/helpers/package-helper-spec.rb

@@ -16,6 +16,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
+require 'rubygems'
 require 'logger'
 require 'boxgrinder-build/helpers/package-helper'
 

data/spec/helpers/plugin-helper-spec.rb

@@ -16,6 +16,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
+require 'rubygems'
 require 'boxgrinder-core/helpers/log-helper'
 require 'boxgrinder-build/helpers/plugin-helper'
 require 'ostruct'

data/spec/managers/plugin-manager-spec.rb

@@ -16,6 +16,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
+require 'rubygems'
 require 'boxgrinder-build/managers/plugin-manager'
 
 module BoxGrinder
@@ -28,14 +29,14 @@ module BoxGrinder
     it "should register simple plugin" do
       @manager.register_plugin({:class => PluginManager, :type => :delivery, :name => :abc, :full_name => "Amazon Simple Storage Service (Amazon S3)"})
 
-      @manager.plugins[:delivery].size.should == 7
+      @manager.plugins[:delivery].size.should == 8
       @manager.plugins[:delivery][:abc][:class].should == PluginManager
     end
 
     it "should register plugin with many types" do
       @manager.register_plugin({:class => PluginManager, :type => :delivery, :name => :def, :full_name => "Amazon Simple Storage Service (Amazon S3)", :types => [:aaa, :bbb, :ccc]})
 
-      @manager.plugins[:delivery].size.should == 10
+      @manager.plugins[:delivery].size.should == 11
       @manager.plugins[:delivery][:abc][:class].should == PluginManager
       @manager.plugins[:delivery][:aaa][:class].should == PluginManager
       @manager.plugins[:delivery][:bbb][:class].should == PluginManager

data/spec/plugins/base-plugin-spec.rb

@@ -212,7 +212,7 @@ module BoxGrinder
 
         lambda {
           @plugin.validate_plugin_config(['one', 'two', 'three'])
-        }.should raise_error(RuntimeError, "Please specify a valid 'three' key in BoxGrinder configuration file: '/home/abc/boxgrinder_config_file' or use CLI '---config three:DATA' argument. ")
+        }.should raise_error(PluginValidationError, "Please specify a valid 'three' key in BoxGrinder configuration file: '/home/abc/boxgrinder_config_file' or use CLI '---config three:DATA' argument. ")
       end
     end