Fixed up missing mshtml dependency which prevented comment editing.

ned14 · Jul 15, 2012 · 954b9ae · 954b9ae
1 parent 34e4e57
commit 954b9ae
Show file tree

Hide file tree

Showing 17 changed files with 115 additions and 55 deletions.
diff --git a/.be/7017b289-f207-4e39-9746-f58323404eba/bugs/a81bb3a5-ada9-43cb-ae9a-007e597783a1/values b/.be/7017b289-f207-4e39-9746-f58323404eba/bugs/a81bb3a5-ada9-43cb-ae9a-007e597783a1/values
@@ -9,7 +9,7 @@ reporter: '"Niall Douglas \(s \[underscore\] sourceforge {at} nedprod \[dot\] co
 severity: minor
 
 
-status: open
+status: fixed
 
 
 summary: Add unit test testing installation and deinstallation on VirtualBox for XP

diff --git a/.be/7017b289-f207-4e39-9746-f58323404eba/bugs/c8cc9a55-ebac-4b00-a69a-7b4c8fb579ad/values b/.be/7017b289-f207-4e39-9746-f58323404eba/bugs/c8cc9a55-ebac-4b00-a69a-7b4c8fb579ad/values
@@ -7,7 +7,7 @@ reporter: '"Niall Douglas" <ned@kate.nedland.local>'
 severity: serious
 
 
-status: open
+status: fixed
 
 
 summary: Still got a failure to invoke git add at line 281 in BEurtlePlugin.cs on

diff --git a/.be/7017b289-f207-4e39-9746-f58323404eba/bugs/d618e32d-1292-457e-825b-9113dd7c89b8/values b/.be/7017b289-f207-4e39-9746-f58323404eba/bugs/d618e32d-1292-457e-825b-9113dd7c89b8/values
@@ -9,7 +9,7 @@ reporter: '"Niall Douglas \(s \[underscore\] sourceforge {at} nedprod \[dot\] co
 severity: wishlist
 
 
-status: open
+status: fixed
 
 
 summary: Add ability to edit and delete comments to BE

diff --git a/...s/dbed42ae-de1f-46b3-8c74-78f55026fff0/comments/d3804606-b149-4789-b3e9-90002657efe8/body b/...s/dbed42ae-de1f-46b3-8c74-78f55026fff0/comments/d3804606-b149-4789-b3e9-90002657efe8/body
@@ -0,0 +1 @@
+In fact, looks like edit has no effect on anything :)
diff --git a/...dbed42ae-de1f-46b3-8c74-78f55026fff0/comments/d3804606-b149-4789-b3e9-90002657efe8/values b/...dbed42ae-de1f-46b3-8c74-78f55026fff0/comments/d3804606-b149-4789-b3e9-90002657efe8/values
@@ -0,0 +1,9 @@
+Author: '"Niall Douglas \(s \[underscore\] sourceforge {at} nedprod \[dot\] com\)"
+  <spam@spamtrap.com>'
+
+
+Content-type: text/html
+
+
+Date: Sun, 15 Jul 2012 20:09:19 +0000
+
diff --git a/.be/7017b289-f207-4e39-9746-f58323404eba/bugs/dbed42ae-de1f-46b3-8c74-78f55026fff0/values b/.be/7017b289-f207-4e39-9746-f58323404eba/bugs/dbed42ae-de1f-46b3-8c74-78f55026fff0/values
@@ -0,0 +1,20 @@
+creator: '"Niall Douglas \(s \[underscore\] sourceforge {at} nedprod \[dot\] com\)"
+  <spam@spamtrap.com>'
+
+
+reporter: '"Niall Douglas \(s \[underscore\] sourceforge {at} nedprod \[dot\] com\)"
+  <spam@spamtrap.com>'
+
+
+severity: serious
+
+
+status: open
+
+
+summary: Editing an existing bug isn't updating the XML cache, probably because BE
+  is being clever enough not to update id-cache
+
+
+time: Sun, 15 Jul 2012 20:08:20 +0000
+
diff --git a/.be/7017b289-f207-4e39-9746-f58323404eba/bugs/e239abe5-aaa3-4cbd-a9a1-aef57070f425/values b/.be/7017b289-f207-4e39-9746-f58323404eba/bugs/e239abe5-aaa3-4cbd-a9a1-aef57070f425/values
@@ -7,7 +7,7 @@ reporter: '"Niall Douglas" <ned@kate.nedland.local>'
 severity: minor
 
 
-status: open
+status: fixed
 
 
 summary: Installer should upgrade existing install, not require manual deinstall first

diff --git a/.be/7017b289-f207-4e39-9746-f58323404eba/bugs/f3184454-1b43-469b-9495-75bb90a60751/values b/.be/7017b289-f207-4e39-9746-f58323404eba/bugs/f3184454-1b43-469b-9495-75bb90a60751/values
@@ -7,7 +7,7 @@ reporter: '"Niall Douglas" <ned@kate.nedland.local>'
 severity: minor
 
 
-status: open
+status: fixed
 
 
 summary: Deinstalling doesn't remove all files from Program Files

diff --git a/BEBugsAsHTML/bugs/c8cc9a55-ebac-4b00-a69a-7b4c8fb579ad/index.html b/BEBugsAsHTML/bugs/c8cc9a55-ebac-4b00-a69a-7b4c8fb579ad/index.html
@@ -10,7 +10,7 @@
     <div class="header">Bugs Everywhere Bug List</div>
     <div class="main">
 
-<p class="backlink"><a href="../../index.html">Back to Active Index</a></p>
+<p class="backlink"><a href="../../index_inactive.html">Back to Inactive Index</a></p>
 <p class="backlink"><a href="../../index_by_target.html">Back to Target Index</a></p>
 <h1>Bug: 701/c8c</h1>
 
@@ -21,7 +21,7 @@ <h1>Bug: 701/c8c</h1>
     <tr><td class="bug_detail_label">Short name :</td>
         <td class="bug_detail">701/c8c</td></tr>
     <tr><td class="bug_detail_label">Status :</td>
-        <td class="bug_detail">open</td></tr>
+        <td class="bug_detail">fixed</td></tr>
     <tr><td class="bug_detail_label">Severity :</td>
         <td class="bug_detail">serious</td></tr>
     <tr><td class="bug_detail_label">Assigned :</td>
@@ -42,7 +42,7 @@ <h1>Bug: 701/c8c</h1>
 
 <p>No comments.</p>
 
-<p class="backlink"><a href="../../index.html">Back to Active Index</a></p>
+<p class="backlink"><a href="../../index_inactive.html">Back to Inactive Index</a></p>
 <p class="backlink"><a href="../../index_by_target.html">Back to Target Index</a></p>
 
     </div>

diff --git a/BEBugsAsHTML/bugs/e239abe5-aaa3-4cbd-a9a1-aef57070f425/index.html b/BEBugsAsHTML/bugs/e239abe5-aaa3-4cbd-a9a1-aef57070f425/index.html
@@ -10,7 +10,7 @@
     <div class="header">Bugs Everywhere Bug List</div>
     <div class="main">
 
-<p class="backlink"><a href="../../index.html">Back to Active Index</a></p>
+<p class="backlink"><a href="../../index_inactive.html">Back to Inactive Index</a></p>
 <p class="backlink"><a href="../../index_by_target.html">Back to Target Index</a></p>
 <h1>Bug: 701/e23</h1>
 
@@ -21,7 +21,7 @@ <h1>Bug: 701/e23</h1>
     <tr><td class="bug_detail_label">Short name :</td>
         <td class="bug_detail">701/e23</td></tr>
     <tr><td class="bug_detail_label">Status :</td>
-        <td class="bug_detail">open</td></tr>
+        <td class="bug_detail">fixed</td></tr>
     <tr><td class="bug_detail_label">Severity :</td>
         <td class="bug_detail">minor</td></tr>
     <tr><td class="bug_detail_label">Assigned :</td>
@@ -42,7 +42,7 @@ <h1>Bug: 701/e23</h1>
 
 <p>No comments.</p>
 
-<p class="backlink"><a href="../../index.html">Back to Active Index</a></p>
+<p class="backlink"><a href="../../index_inactive.html">Back to Inactive Index</a></p>
 <p class="backlink"><a href="../../index_by_target.html">Back to Target Index</a></p>
 
     </div>

diff --git a/BEBugsAsHTML/bugs/f3184454-1b43-469b-9495-75bb90a60751/index.html b/BEBugsAsHTML/bugs/f3184454-1b43-469b-9495-75bb90a60751/index.html
@@ -10,7 +10,7 @@
     <div class="header">Bugs Everywhere Bug List</div>
     <div class="main">
 
-<p class="backlink"><a href="../../index.html">Back to Active Index</a></p>
+<p class="backlink"><a href="../../index_inactive.html">Back to Inactive Index</a></p>
 <p class="backlink"><a href="../../index_by_target.html">Back to Target Index</a></p>
 <h1>Bug: 701/f31</h1>
 
@@ -21,7 +21,7 @@ <h1>Bug: 701/f31</h1>
     <tr><td class="bug_detail_label">Short name :</td>
         <td class="bug_detail">701/f31</td></tr>
     <tr><td class="bug_detail_label">Status :</td>
-        <td class="bug_detail">open</td></tr>
+        <td class="bug_detail">fixed</td></tr>
     <tr><td class="bug_detail_label">Severity :</td>
         <td class="bug_detail">minor</td></tr>
     <tr><td class="bug_detail_label">Assigned :</td>
@@ -42,7 +42,7 @@ <h1>Bug: 701/f31</h1>
 
 <p>No comments.</p>
 
-<p class="backlink"><a href="../../index.html">Back to Active Index</a></p>
+<p class="backlink"><a href="../../index_inactive.html">Back to Inactive Index</a></p>
 <p class="backlink"><a href="../../index_by_target.html">Back to Target Index</a></p>
 
     </div>

diff --git a/BEBugsAsHTML/index.html b/BEBugsAsHTML/index.html
@@ -34,43 +34,11 @@
   <tbody>
 
     <tr class="serious">
-  <td class="uuid"><a href="bugs/c8cc9a55-ebac-4b00-a69a-7b4c8fb579ad/index.html">701/c8c</a></td>
-  <td class="status"><a href="bugs/c8cc9a55-ebac-4b00-a69a-7b4c8fb579ad/index.html">open</a></td>
-  <td class="severity"><a href="bugs/c8cc9a55-ebac-4b00-a69a-7b4c8fb579ad/index.html">serious</a></td>
-  <td class="summary"><a href="bugs/c8cc9a55-ebac-4b00-a69a-7b4c8fb579ad/index.html">Still got a failure to invoke git add at line 281 in BEurtlePlugin.cs on the mini laptop.</a></td>
-  <td class="date"><a href="bugs/c8cc9a55-ebac-4b00-a69a-7b4c8fb579ad/index.html">Thu, 08 Sep 2011 13:05:10 +0000</a></td>
-</tr>
-
-    <tr class="minor">
-  <td class="uuid"><a href="bugs/a81bb3a5-ada9-43cb-ae9a-007e597783a1/index.html">701/a81</a></td>
-  <td class="status"><a href="bugs/a81bb3a5-ada9-43cb-ae9a-007e597783a1/index.html">open</a></td>
-  <td class="severity"><a href="bugs/a81bb3a5-ada9-43cb-ae9a-007e597783a1/index.html">minor</a></td>
-  <td class="summary"><a href="bugs/a81bb3a5-ada9-43cb-ae9a-007e597783a1/index.html">Add unit test testing installation and deinstallation on VirtualBox for XP and Win7</a></td>
-  <td class="date"><a href="bugs/a81bb3a5-ada9-43cb-ae9a-007e597783a1/index.html">Fri, 13 Jul 2012 13:03:08 +0000</a></td>
-</tr>
-
-    <tr class="minor">
-  <td class="uuid"><a href="bugs/e239abe5-aaa3-4cbd-a9a1-aef57070f425/index.html">701/e23</a></td>
-  <td class="status"><a href="bugs/e239abe5-aaa3-4cbd-a9a1-aef57070f425/index.html">open</a></td>
-  <td class="severity"><a href="bugs/e239abe5-aaa3-4cbd-a9a1-aef57070f425/index.html">minor</a></td>
-  <td class="summary"><a href="bugs/e239abe5-aaa3-4cbd-a9a1-aef57070f425/index.html">Installer should upgrade existing install, not require manual deinstall first</a></td>
-  <td class="date"><a href="bugs/e239abe5-aaa3-4cbd-a9a1-aef57070f425/index.html">Thu, 08 Sep 2011 13:08:20 +0000</a></td>
-</tr>
-
-    <tr class="minor">
-  <td class="uuid"><a href="bugs/f3184454-1b43-469b-9495-75bb90a60751/index.html">701/f31</a></td>
-  <td class="status"><a href="bugs/f3184454-1b43-469b-9495-75bb90a60751/index.html">open</a></td>
-  <td class="severity"><a href="bugs/f3184454-1b43-469b-9495-75bb90a60751/index.html">minor</a></td>
-  <td class="summary"><a href="bugs/f3184454-1b43-469b-9495-75bb90a60751/index.html">Deinstalling doesn&#39;t remove all files from Program Files</a></td>
-  <td class="date"><a href="bugs/f3184454-1b43-469b-9495-75bb90a60751/index.html">Sun, 14 Aug 2011 20:18:27 +0000</a></td>
-</tr>
-
-    <tr class="wishlist">
-  <td class="uuid"><a href="bugs/d618e32d-1292-457e-825b-9113dd7c89b8/index.html">701/d61</a></td>
-  <td class="status"><a href="bugs/d618e32d-1292-457e-825b-9113dd7c89b8/index.html">open</a></td>
-  <td class="severity"><a href="bugs/d618e32d-1292-457e-825b-9113dd7c89b8/index.html">wishlist</a></td>
-  <td class="summary"><a href="bugs/d618e32d-1292-457e-825b-9113dd7c89b8/index.html">Add ability to edit and delete comments to BE</a></td>
-  <td class="date"><a href="bugs/d618e32d-1292-457e-825b-9113dd7c89b8/index.html">Sat, 14 Jul 2012 18:04:55 +0000</a></td>
+  <td class="uuid"><a href="bugs/dbed42ae-de1f-46b3-8c74-78f55026fff0/index.html">701/dbe</a></td>
+  <td class="status"><a href="bugs/dbed42ae-de1f-46b3-8c74-78f55026fff0/index.html">open</a></td>
+  <td class="severity"><a href="bugs/dbed42ae-de1f-46b3-8c74-78f55026fff0/index.html">serious</a></td>
+  <td class="summary"><a href="bugs/dbed42ae-de1f-46b3-8c74-78f55026fff0/index.html">Editing an existing bug isn&#39;t updating the XML cache, probably because BE is being clever enough not to update id-cache</a></td>
+  <td class="date"><a href="bugs/dbed42ae-de1f-46b3-8c74-78f55026fff0/index.html">Sun, 15 Jul 2012 20:08:20 +0000</a></td>
 </tr>
 
     <tr class="wishlist">

diff --git a/BEBugsAsHTML/index_inactive.html b/BEBugsAsHTML/index_inactive.html
@@ -41,6 +41,14 @@
   <td class="date"><a href="bugs/ae86aba3-f61b-44cd-9968-31e610bab31e/index.html">Mon, 01 Aug 2011 21:21:46 +0000</a></td>
 </tr>
 
+    <tr class="serious">
+  <td class="uuid"><a href="bugs/c8cc9a55-ebac-4b00-a69a-7b4c8fb579ad/index.html">701/c8c</a></td>
+  <td class="status"><a href="bugs/c8cc9a55-ebac-4b00-a69a-7b4c8fb579ad/index.html">fixed</a></td>
+  <td class="severity"><a href="bugs/c8cc9a55-ebac-4b00-a69a-7b4c8fb579ad/index.html">serious</a></td>
+  <td class="summary"><a href="bugs/c8cc9a55-ebac-4b00-a69a-7b4c8fb579ad/index.html">Still got a failure to invoke git add at line 281 in BEurtlePlugin.cs on the mini laptop.</a></td>
+  <td class="date"><a href="bugs/c8cc9a55-ebac-4b00-a69a-7b4c8fb579ad/index.html">Thu, 08 Sep 2011 13:05:10 +0000</a></td>
+</tr>
+
     <tr class="serious">
   <td class="uuid"><a href="bugs/789e8e92-8322-4b5d-acc4-c9c2fd36e225/index.html">701/789</a></td>
   <td class="status"><a href="bugs/789e8e92-8322-4b5d-acc4-c9c2fd36e225/index.html">fixed</a></td>
@@ -73,6 +81,22 @@
   <td class="date"><a href="bugs/9f6af2d4-e5d3-47e5-95f1-da1c7807eab6/index.html">Tue, 02 Aug 2011 16:27:17 +0000</a></td>
 </tr>
 
+    <tr class="minor">
+  <td class="uuid"><a href="bugs/a81bb3a5-ada9-43cb-ae9a-007e597783a1/index.html">701/a81</a></td>
+  <td class="status"><a href="bugs/a81bb3a5-ada9-43cb-ae9a-007e597783a1/index.html">fixed</a></td>
+  <td class="severity"><a href="bugs/a81bb3a5-ada9-43cb-ae9a-007e597783a1/index.html">minor</a></td>
+  <td class="summary"><a href="bugs/a81bb3a5-ada9-43cb-ae9a-007e597783a1/index.html">Add unit test testing installation and deinstallation on VirtualBox for XP and Win7</a></td>
+  <td class="date"><a href="bugs/a81bb3a5-ada9-43cb-ae9a-007e597783a1/index.html">Fri, 13 Jul 2012 13:03:08 +0000</a></td>
+</tr>
+
+    <tr class="minor">
+  <td class="uuid"><a href="bugs/e239abe5-aaa3-4cbd-a9a1-aef57070f425/index.html">701/e23</a></td>
+  <td class="status"><a href="bugs/e239abe5-aaa3-4cbd-a9a1-aef57070f425/index.html">fixed</a></td>
+  <td class="severity"><a href="bugs/e239abe5-aaa3-4cbd-a9a1-aef57070f425/index.html">minor</a></td>
+  <td class="summary"><a href="bugs/e239abe5-aaa3-4cbd-a9a1-aef57070f425/index.html">Installer should upgrade existing install, not require manual deinstall first</a></td>
+  <td class="date"><a href="bugs/e239abe5-aaa3-4cbd-a9a1-aef57070f425/index.html">Thu, 08 Sep 2011 13:08:20 +0000</a></td>
+</tr>
+
     <tr class="minor">
   <td class="uuid"><a href="bugs/10f9bb50-578c-433c-b535-f88d385ee143/index.html">701/10f</a></td>
   <td class="status"><a href="bugs/10f9bb50-578c-433c-b535-f88d385ee143/index.html">fixed</a></td>
@@ -97,6 +121,14 @@
   <td class="date"><a href="bugs/0ab78df7-1857-433b-a929-bc73c1582f57/index.html">Sun, 14 Aug 2011 20:20:12 +0000</a></td>
 </tr>
 
+    <tr class="minor">
+  <td class="uuid"><a href="bugs/f3184454-1b43-469b-9495-75bb90a60751/index.html">701/f31</a></td>
+  <td class="status"><a href="bugs/f3184454-1b43-469b-9495-75bb90a60751/index.html">fixed</a></td>
+  <td class="severity"><a href="bugs/f3184454-1b43-469b-9495-75bb90a60751/index.html">minor</a></td>
+  <td class="summary"><a href="bugs/f3184454-1b43-469b-9495-75bb90a60751/index.html">Deinstalling doesn&#39;t remove all files from Program Files</a></td>
+  <td class="date"><a href="bugs/f3184454-1b43-469b-9495-75bb90a60751/index.html">Sun, 14 Aug 2011 20:18:27 +0000</a></td>
+</tr>
+
     <tr class="minor">
   <td class="uuid"><a href="bugs/ce29ed7b-76a6-4474-ba7c-c5ebe2832404/index.html">701/ce2</a></td>
   <td class="status"><a href="bugs/ce29ed7b-76a6-4474-ba7c-c5ebe2832404/index.html">fixed</a></td>
@@ -113,6 +145,14 @@
   <td class="date"><a href="bugs/3cbc1df0-8f78-4273-a8ea-7b50e9cbabd0/index.html">Tue, 02 Aug 2011 16:27:33 +0000</a></td>
 </tr>
 
+    <tr class="wishlist">
+  <td class="uuid"><a href="bugs/d618e32d-1292-457e-825b-9113dd7c89b8/index.html">701/d61</a></td>
+  <td class="status"><a href="bugs/d618e32d-1292-457e-825b-9113dd7c89b8/index.html">fixed</a></td>
+  <td class="severity"><a href="bugs/d618e32d-1292-457e-825b-9113dd7c89b8/index.html">wishlist</a></td>
+  <td class="summary"><a href="bugs/d618e32d-1292-457e-825b-9113dd7c89b8/index.html">Add ability to edit and delete comments to BE</a></td>
+  <td class="date"><a href="bugs/d618e32d-1292-457e-825b-9113dd7c89b8/index.html">Sat, 14 Jul 2012 18:04:55 +0000</a></td>
+</tr>
+
     <tr class="wishlist">
   <td class="uuid"><a href="bugs/cd102e10-c14c-4c04-acb5-99efa649b511/index.html">701/cd1</a></td>
   <td class="status"><a href="bugs/cd102e10-c14c-4c04-acb5-99efa649b511/index.html">fixed</a></td>

diff --git a/Installer/Bundle.wxs b/Installer/Bundle.wxs
@@ -19,6 +19,7 @@
 
     <Chain>
       <PackageGroupRef Id="Netfx20" />
+      <PackageGroupRef Id="Mshtml" />
 
       <RollbackBoundary />
 
@@ -42,6 +43,7 @@
 
   <Fragment>
     <util:RegistrySearch Root="HKLM" Key="SOFTWARE\Microsoft\Net Framework Setup\NDP\v2.0.50727" Value="Version" Variable="Netfx20Version" />
+    <util:RegistrySearch Root="HKCR" Key="Installer\Assemblies\Global" Value="Microsoft.mshtml,Version=&quot;7.0.3300.0&quot;,PublicKeyToken=&quot;b03f5f7f11d50a3a&quot;,Culture=&quot;neutral&quot;,FileVersion=&quot;7.0.3300.0&quot;" Variable="MshtmlVersion" />
 
     <PackageGroup Id="Netfx20">
       <!-- This embeds the .NET 3.0 web installer for virgin WinXP installs. Costs ~3Mb extra to installer size + 50Mb to download. -->
@@ -93,5 +95,20 @@
         <ExitCode Value ="3010" Behavior="forceReboot" />
       </ExePackage>
     </PackageGroup>
-  </Fragment>
+
+    <PackageGroup Id="Mshtml">
+      <ExePackage Id="Netfx20"
+        Cache="no"
+        Compressed="yes"
+        PerMachine="yes"
+        Permanent="yes"
+        Vital="yes"
+        Name="Redist\vs_piaredist.exe"
+        SourceFile="Redist\vs_piaredist.exe"
+        InstallCondition="NOT MshtmlVersion"
+        DetectCondition="MshtmlVersion">
+        <ExitCode Value ="3010" Behavior="forceReboot" />
+      </ExePackage>
+    </PackageGroup>
+    </Fragment>
 </Wix>
diff --git a/Installer/Redist/vs_piaredist.exe b/Installer/Redist/vs_piaredist.exe
diff --git a/Installer/test/__main__.py b/Installer/test/__main__.py
@@ -123,9 +123,12 @@ def test_push_winxp(self):
             progress=guest.copyToGuest(os.path.abspath("Redist/NetFx20SP2_x86.exe"), "C:\\wb_test\\NetFx20SP2_x86.exe", TEST_ACCOUNT, TEST_ACCOUNT_PASSWORD, 0)
             progressBar(progress)
             if progress.getResultCode()!=0: raise Exception, "Timed out copying in me"
+            progress=guest.copyToGuest(os.path.abspath("test/TortoiseSVN-1.6.6.17493-win32-svn-1.6.6.msi"), "C:\\wb_test\\TortoiseSVN-1.6.6.17493-win32-svn-1.6.6.msi", TEST_ACCOUNT, TEST_ACCOUNT_PASSWORD, 0)
+            progressBar(progress)
+            if progress.getResultCode()!=0: raise Exception, "Timed out copying in me"
 
             # Execute configurator
-            progress, pid=guest.executeProcess("C:\\wb_test\\installer.exe", 0, ["-dC:\\wb_test"], [], TEST_ACCOUNT_ADMIN, TEST_ACCOUNT_ADMIN_PASSWORD, 0)
+            progress, pid=guest.executeProcess("c:\\windows\\system32\\msiexec.exe", 0, ["/quiet", "/norestart", "/i", "C:\\wb_test\\TortoiseSVN-1.6.6.17493-win32-svn-1.6.6.msi"], [], TEST_ACCOUNT_ADMIN, TEST_ACCOUNT_ADMIN_PASSWORD, 0)
             print "Executed installer with pid", pid
             #if pid!=0 and 0:
             #    while not progress.completed:
@@ -134,8 +137,10 @@ def test_push_winxp(self):
             #        if data and len(data)>0:
             #            sys.stdout.write(data)
             #            continue
-            #progress.waitForCompletion(12000)
-            #if progress.getResultCode()!=0: raise Exception, "Timed out installing stuff"
+            progress.waitForCompletion(200000)
+            if progress.getResultCode()!=0: raise Exception, "Timed out installing stuff"
+            progress, pid=guest.executeProcess("C:\\wb_test\\installer.exe", 0, [], [], TEST_ACCOUNT_ADMIN, TEST_ACCOUNT_ADMIN_PASSWORD, 0)
+            print "Executed installer with pid", pid
 
         finally:
             # Turn off the beastie

diff --git a/Licence.rtf b/Licence.rtf