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

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

Revision: 945
          http://cedar-backup.svn.sourceforge.net/cedar-backup/?rev=945&view=rev
Author:   pronovic
Date:     2009-08-16 18:21:36 +0000 (Sun, 16 Aug 2009)

Log Message:
-----------
Fix testGenerateTarfile_002() so it works with Python 2.6

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

Modified: cedar-backup2/trunk/Changelog
===================================================================
--- cedar-backup2/trunk/Changelog	2009-03-29 19:52:00 UTC (rev 944)
+++ cedar-backup2/trunk/Changelog	2009-08-16 18:21:36 UTC (rev 945)
@@ -1,3 +1,7 @@
+Version 2.19.4    unreleased
+
+	* Fix testGenerateTarfile_002() so it works with Python 2.6.
+
 Version 2.19.3    29 Mar 2009
 
 	* Fix minor epydoc typos, mostly in @sort directives.

Modified: cedar-backup2/trunk/test/filesystemtests.py
===================================================================
--- cedar-backup2/trunk/test/filesystemtests.py	2009-03-29 19:52:00 UTC (rev 944)
+++ cedar-backup2/trunk/test/filesystemtests.py	2009-08-16 18:21:36 UTC (rev 945)
@@ -17212,7 +17212,8 @@
          tarFile.close()
          self.failUnlessEqual(11, len(tarList))
          self.failUnless(self.tarPath([ "tree9", "dir001/" ]) in tarList 
-                         or self.tarPath([ "tree9", "dir001//" ]) in tarList)  # Grr... Python 2.5 behavior differs
+                         or self.tarPath([ "tree9", "dir001//" ]) in tarList  # Grr... Python 2.5 behavior differs
+                         or self.tarPath([ "tree9", "dir001", ]) in tarList)  # Grr... Python 2.6 behavior differs
          self.failUnless(self.tarPath([ "tree9", "dir001", "file001", ]) in tarList)
          self.failUnless(self.tarPath([ "tree9", "dir001", "file002", ]) in tarList)
          self.failUnless(self.tarPath([ "tree9", "dir001", "link001", ]) in tarList)
@@ -17252,7 +17253,8 @@
          tarFile.close()
          self.failUnlessEqual(16, len(tarList))
          self.failUnless(self.tarPath([ "tree9", "dir001/" ]) in tarList 
-                         or self.tarPath([ "tree9", "dir001//" ]) in tarList)  # Grr... Python 2.5 behavior differs
+                         or self.tarPath([ "tree9", "dir001//" ]) in tarList  # Grr... Python 2.5 behavior differs
+                         or self.tarPath([ "tree9", "dir001", ]) in tarList)  # Grr... Python 2.6 behavior differs
          self.failUnless(self.tarPath([ "tree9", "dir001", "file001", ]) in tarList)
          self.failUnless(self.tarPath([ "tree9", "dir001", "file002", ]) in tarList)
          self.failUnless(self.tarPath([ "tree9", "dir001", "link001", ]) in tarList)


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