Merge lp:~ben-blankley/testdrive/fix-940755 into lp:testdrive

[Ben Blankley]

Fixed PAE error when using VirtualBox to test ISOs by setting the VirtualBox PAE option on.

[Jackson Doak (noskcaj)]

Looks good. I'll let dustin or andres do the final merge since i don't think they trust me yet.

review: Approve

[Ben Blankley (ben-blankley)]

> Looks good. I'll let dustin or andres do the final merge since i don't think
> they trust me yet.

Do I have to add them as reviewers on the merge request, or does Launchpad do that automatically? Thanks.

[Jackson Doak (noskcaj)]

It notifies them too. really you shouldn't have to request a review
because the whole testdrive team sees it.

On Fri, Sep 20, 2013 at 4:07 AM, Ben Blankley <email address hidden> wrote:
>> Looks good. I'll let dustin or andres do the final merge since i don't think
>> they trust me yet.
>
> Do I have to add them as reviewers on the merge request, or does Launchpad do that automatically? Thanks.
> --
> https://code.launchpad.net/~ben-blankley/testdrive/fix-940755/+merge/186470
> You are reviewing the proposed merge of lp:~ben-blankley/testdrive/fix-940755 into lp:testdrive.

=== modified file 'testdrive/virt/virtualbox.py'
--- testdrive/virt/virtualbox.py	2013-08-10 20:52:38 +0000
+++ testdrive/virt/virtualbox.py	2013-09-19 06:17:28 +0000
@@ -86,6 +86,7 @@
         self.run_or_die("VBoxManage modifyvm %s --boot1 disk" % self.VBOX_NAME)
         self.run_or_die("VBoxManage modifyvm %s --boot2 dvd" % self.VBOX_NAME)
         self.run_or_die("VBoxManage modifyvm %s --nic1 nat" % self.VBOX_NAME)
+   	self.run_or_die("VBoxManage modifyvm %s --pae on" % self.VBOX_NAME)
 
     # Code launch virtual machine
     def launch_virt(self):