[cedar-backup-svn] SF.net SVN: cedar-backup: [880] cedar-backup2/trunk

[<pro...@us...>]

Revision: 880
          http://cedar-backup.svn.sourceforge.net/cedar-backup/?rev=880&view=rev
Author:   pronovic
Date:     2008-03-19 21:19:19 -0700 (Wed, 19 Mar 2008)

Log Message:
-----------
Fix filesystemtests.TestBackupFileList.testGenerateFitted_004()

Modified Paths:
--------------
    cedar-backup2/trunk/Changelog
    cedar-backup2/trunk/test/filesystemtests.py

Modified: cedar-backup2/trunk/Changelog
===================================================================
--- cedar-backup2/trunk/Changelog	2008-03-20 04:00:23 UTC (rev 879)
+++ cedar-backup2/trunk/Changelog	2008-03-20 04:19:19 UTC (rev 880)
@@ -1,14 +1,15 @@
 Version 2.16.1		unreleased
 
-	* Change suggested execution index for Capacity in manual.
-	* Fix utiltests.TestFunctions.testNullDevice_001() for Windows 2000.
-	* Fix typo in filesystemtests.TestFilesystemList.testRemoveLinks_002().
+	* Change suggested execution index for Capacity extension in manual.
 	* Clean up filesystem code that deals with file age, and improve unit tests.
 	  - Some platforms apparently cannot set file ages precisely
 	  - Change calculateFileAge() to use floats throughout, which is safer
 	  - Change removeYoungFiles() to explicitly check on whole days
 	  - Put a 1-second fudge factor into unit tests when setting file ages
-	  - This is really a test-only bug, but better safe than sorry
+	* Fix some unit test failures discovered on Windows 2000.
+	  - Fix utiltests.TestFunctions.testNullDevice_001()
+	  - Fix filesystemtests.TestBackupFileList.testGenerateFitted_004() 
+	  - Fix typo in filesystemtests.TestFilesystemList.testRemoveLinks_002()
 
 Version 2.16.0		18 Mar 2008
 

Modified: cedar-backup2/trunk/test/filesystemtests.py
===================================================================
--- cedar-backup2/trunk/test/filesystemtests.py	2008-03-20 04:00:23 UTC (rev 879)
+++ cedar-backup2/trunk/test/filesystemtests.py	2008-03-20 04:19:19 UTC (rev 880)
@@ -16243,6 +16243,13 @@
       """
       Test on a non-empty list containing only valid entries, some of which
       fit.  
+
+      We can get some strange behavior on Windows, which hits the "links not
+      supported" case.  The file tree9/dir002/file002 is 74 bytes, and is
+      supposed to be the only file included because links are not recognized.
+      However, link004 points at file002, and apparently Windows (sometimes?)
+      sees link004 as a real file with a size of 74 bytes.  Since only one of
+      the two fits in the fitted list, we just check for one or the other.
       """
       self.extractTar("tree9")
       path = self.buildPath(["tree9"])
@@ -16263,7 +16270,8 @@
          self.failUnless(self.buildPath([ "tree9", "file002", ]) in backupList)
          fittedList = backupList.generateFitted(80)
          self.failUnlessEqual(1, len(fittedList))
-         self.failUnless(self.buildPath([ "tree9", "dir001", "file002", ]) in fittedList)
+         self.failUnless((self.buildPath([ "tree9", "dir002", "file002", ]) in fittedList) or
+                         (self.buildPath([ "tree9", "dir002", "link004", ] in fittedList)))
       else:
          self.failUnlessEqual(15, count)
          self.failUnlessEqual(15, len(backupList))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.