Changeset 71096 in vbox for trunk/src/VBox/ValidationKit/tests/api

Timestamp:

Feb 22, 2018 9:39:33 AM (7 years ago)

Author:

vboxsync

Message:

bugref:8344. all cases have been unblocked. Added a comment with explanation of logic for 3d case.

File:

• trunk/src/VBox/ValidationKit/tests/api/tdMoveMedium1.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/tests/api/tdMoveMedium1.py

@@ -157 +157 @@
 
             #case 3. Path with file name
-            #fRc = self.setLocation(os.path.join(sNewLoc, 'newName'), aoMediumAttachments) and fRc
-            #asNewFiles = ['newName' + os.path.splitext(s)[1] for s in asFiles]
-            #fRc = self.checkLocation(os.path.join(sNewLoc, 'newName'), aoMediumAttachments, asFiles) and fRc
-            # BUG! the check above succeeds, but it actually should be the one below which does
-            #fRc = self.checkLocation(sNewLoc, aoMediumAttachments, asNewFiles) and fRc
+            #The case supposes that user has passed a destination path with a file name but hasn't added an extension/suffix
+            #to this destination file. User supposes that the extension would be added automatically and to be the same as
+            #for the original file. Difficult case, apparently this case should follow mv(1) logic
+            #and the file name is processed as folder name (aka mv(1) logic). 
+            #Be discussed.
+            fRc = self.setLocation(os.path.join(sNewLoc, 'newName'), aoMediumAttachments) and fRc
+            asNewFiles = ['newName' + os.path.splitext(s)[1] for s in asFiles]
+            fRc = self.checkLocation(os.path.join(sNewLoc, 'newName'), aoMediumAttachments, asFiles) and fRc
+
+            #after the case the destination path must be corrected
+            sNewLoc = os.path.join(sNewLoc, 'newName')
 
             #case 4. Only file name
-            #fRc = self.setLocation('onlyMediumName', aoMediumAttachments) and fRc
-            #asNewFiles = ['onlyMediumName' + os.path.splitext(s)[1] for s in asFiles]
-            #fRc = self.checkLocation(os.path.join(sNewLoc, 'newName'), aoMediumAttachments, asFiles) and fRc
-                                #     [s.replace('.hdd', '.parallels') for s in asNewFiles]) and fRc
-            # BUG! due to the above path mishandling the check above succeeds, the directory issue is
-            # a consequence of the bug in case 3, but the extension is also picked incorrectly, it is
-            # not correct to just pick the backend id as the extension, it needs looking at the ext list.
-            #fRc = self.checkLocation(sNewLoc, aoMediumAttachments, asNewFiles) and fRc
+            fRc = self.setLocation('onlyMediumName', aoMediumAttachments) and fRc
+            asNewFiles = ['onlyMediumName' + os.path.splitext(s)[1] for s in asFiles]
+            fRc = self.checkLocation(sNewLoc, aoMediumAttachments, asNewFiles) and fRc
 
             #case 5. Move all files from a snapshot