One more negative test

glennmatthews · Jan 29, 2015 · ea8529f · ea8529f
1 parent f235056
commit ea8529f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/COT/tests/add_disk.py b/COT/tests/add_disk.py
@@ -631,6 +631,8 @@ def test_overwrite_implicit_file_id(self):
 +      </ovf:Item>
      </ovf:VirtualHardwareSection>
         """.format(input_size=self.FILE_SIZE['input.vmdk']))
+        # ovftool will fail because invalid_ovf has an invalid Disk fileRef
+        self.validate_output_with_ovftool = False
 
     def test_overwrite_disk_with_bad_host_resource(self):
         self.instance.set_value("PACKAGE", self.invalid_ovf)
@@ -639,8 +641,7 @@ def test_overwrite_disk_with_bad_host_resource(self):
         self.instance.set_value("address", "0:0")
         with self.assertRaises(ValueUnsupportedError) as cm:
             self.instance.run()
-        self.assertRegexpMatches(str(cm.exception),
-                                 "HostResource")
+        self.assertTrue(re.search("HostResource", str(cm.exception)))
 
     def test_overwrite_disk_with_bad_parent_by_file(self):
         self.instance.set_value("PACKAGE", self.invalid_ovf)
@@ -654,3 +655,9 @@ def test_overwrite_disk_with_bad_parent_by_fileid(self):
         self.instance.set_value("DISK_IMAGE", self.new_vmdk)
         self.instance.set_value("file_id", "input.iso")
         self.assertRaises(LookupError, self.instance.run)
+
+    def test_overwrite_disk_with_bad_fileref(self):
+        self.instance.set_value("PACKAGE", self.invalid_ovf)
+        self.instance.set_value("DISK_IMAGE", self.new_vmdk)
+        self.instance.set_value("file_id", "flash2")
+        self.assertRaises(LookupError, self.instance.run)
diff --git a/COT/tests/invalid.ovf b/COT/tests/invalid.ovf
@@ -7,7 +7,7 @@
   <ovf:DiskSection>
     <ovf:Info>Virtual disk information</ovf:Info>
     <ovf:Disk ovf:capacity="1" ovf:capacityAllocationUnits="byte * 2^30" ovf:diskId="input.vmdk" ovf:fileRef="input.vmdk" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" />
-    <ovf:Disk ovf:capacity="128" ovf:capacityAllocationUnits="byte * 2^20" ovf:diskId="flash2" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" />
+    <ovf:Disk ovf:capacity="128" ovf:capacityAllocationUnits="byte * 2^20" ovf:diskId="flash2" ovf:fileRef="flash2" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" />
   </ovf:DiskSection>
   <ovf:DeploymentOptionSection>
     <ovf:Info>Configuration Profiles</ovf:Info>