← Back to branch summary

~ed.so/duplicity/reuse-passphrase-for-signing-fix

« back to all changes in this revision

Viewing changes to testing/collectionstest.py

  • Committer: Kenneth Loafman
  • Date: 2009-09-25 14:19:25 UTC
  • Revision ID: kenneth@loafman.com-20090925141925-g2g4qdhfjsmm2ih9
Fix problems with unittests under Jaunty.  It appears that redirection
in os.system() has changed for the worse, so a workaround for now.

Fix problem in restart where there were no manifest entries and no
remote volumes stored.  We clean out the partial and restart.

Show diffs side-by-side

added added

removed removed

Lines of Context:
testing/collectionstest.py
71
71
                  "duplicity-inc.2000-08-17T16:17:01-07:00.to.2000-08-18T00:04:30-07:00.vol1.difftar.gpg",
72
72
                  "Extra stuff to be ignored"]
73
73
 
74
 
assert not os.system("tar xzf testfiles.tar.gz >& /dev/null")
 
74
assert not os.system("tar xzf testfiles.tar.gz > /dev/null 2>&1")
75
75
 
76
76
col_test_dir = path.Path("testfiles/collectionstest")
77
77
archive_dir = col_test_dir.append("archive_dir")
89
89
class CollectionTest(unittest.TestCase):
90
90
    """Test collections"""
91
91
    def setUp(self):
92
 
        assert not os.system("tar xzf testfiles.tar.gz >& /dev/null")
 
92
        assert not os.system("tar xzf testfiles.tar.gz > /dev/null 2>&1")
93
93
        assert not os.system("mkdir testfiles/output")
94
94
 
95
95
    def tearDown(self):