More accurate rescue mode testing for XenAPI
More accurate rescue mode testing for XenAPI

Update test_rescue to make sure the swap partition wasn't rescued. Since
this test fails with the current code, I also updated the code so the test
passed.

Fixes bug 997835

Change-Id: I9f09b3bbbee0ddfcbfdb243a7dff0b9bae99925d

n0ano/gantt,n0ano/gantt