~germar/duplicity/par2

« back to all changes in this revision

Viewing changes to testing/tests/logtest.py

  • Committer: Michael Terry
  • Date: 2011-11-07 15:08:24 UTC
  • mto: This revision was merged to the branch mainline in revision 802.
  • Revision ID: michael.terry@canonical.com-20111107150824-vbmqdlyhapbxu0yp
Make tarball layout match bzr layout much more closely; ship tests in tarballs and adjust things so that they can work

Show diffs side-by-side

added added

removed removed

Lines of Context:
24
24
class LogTest(unittest.TestCase):
25
25
    """Test machine-readable functions/classes in log.py"""
26
26
 
27
 
    duplicity_bin = "../duplicity-bin"
28
 
 
29
27
    def setUp(self):
30
28
        assert not os.system("rm -f /tmp/duplicity.log")
31
29
 
36
34
        """Check notification of a simple error code"""
37
35
 
38
36
        # Run actual duplicity command (will fail, because no arguments passed)
39
 
        os.system("%s --log-file=/tmp/duplicity.log >/dev/null 2>&1" % self.duplicity_bin)
 
37
        os.system("duplicity --log-file=/tmp/duplicity.log >/dev/null 2>&1")
40
38
 
41
39
        # The format of the file should be:
42
40
        # """ERROR 2