tjh.dev
1commit ccd4dd92cd37acce1da20966ad9e4e0c7bcf1709
2Author: Guillaume Girol <symphorien+git@xlumurb.eu>
3Date: Sun Jul 11 12:00:00 2021 +0000
4
5 use installed duplicity when running tests
6
7diff --git a/setup.py b/setup.py
8index fa474f20..604a242a 100755
9--- a/setup.py
10+++ b/setup.py
11@@ -205,10 +205,6 @@ class TestCommand(test):
12 except Exception:
13 pass
14
15- os.environ[u'PATH'] = u"%s:%s" % (
16- os.path.abspath(build_scripts_cmd.build_dir),
17- os.environ.get(u'PATH'))
18-
19 test.run(self)
20
21
22diff --git a/testing/functional/__init__.py b/testing/functional/__init__.py
23index 4221576d..3cf44945 100644
24--- a/testing/functional/__init__.py
25+++ b/testing/functional/__init__.py
26@@ -111,7 +111,7 @@ class FunctionalTestCase(DuplicityTestCase):
27 run_coverage = os.environ.get(u'RUN_COVERAGE', None)
28 if run_coverage is not None:
29 cmd_list.extend([u"-m", u"coverage", u"run", u"--source=duplicity", u"-p"])
30- cmd_list.extend([u"{0}/bin/duplicity".format(_top_dir)])
31+ cmd_list.extend([u"duplicity"])
32 cmd_list.extend(options)
33 cmd_list.extend([u"-v0"])
34 cmd_list.extend([u"--no-print-statistics"])
35diff --git a/testing/functional/test_log.py b/testing/functional/test_log.py
36index 9dfc86a6..b9cb55db 100644
37--- a/testing/functional/test_log.py
38+++ b/testing/functional/test_log.py
39@@ -49,9 +49,9 @@ class LogTest(FunctionalTestCase):
40 # Run actual duplicity command (will fail, because no arguments passed)
41 basepython = os.environ.get(u'TOXPYTHON', None)
42 if basepython is not None:
43- os.system(u"{0} {1}/bin/duplicity --log-file={2} >/dev/null 2>&1".format(basepython, _top_dir, self.logfile))
44+ os.system(u"{0} duplicity --log-file={1} >/dev/null 2>&1".format(basepython, self.logfile))
45 else:
46- os.system(u"{0}/bin/duplicity --log-file={1} >/dev/null 2>&1".format(_top_dir, self.logfile))
47+ os.system(u"duplicity --log-file={0} >/dev/null 2>&1".format(self.logfile))
48
49 # The format of the file should be:
50 # """ERROR 2
51diff --git a/testing/functional/test_rdiffdir.py b/testing/functional/test_rdiffdir.py
52index 0cbfdb33..47acd029 100644
53--- a/testing/functional/test_rdiffdir.py
54+++ b/testing/functional/test_rdiffdir.py
55@@ -44,7 +44,7 @@ class RdiffdirTest(FunctionalTestCase):
56 basepython = os.environ.get(u'TOXPYTHON', None)
57 if basepython is not None:
58 cmd_list.extend([basepython])
59- cmd_list.extend([u"{0}/bin/rdiffdir".format(_top_dir)])
60+ cmd_list.extend([u"rdiffdir"])
61 cmd_list.extend(argstring.split())
62 cmdline = u" ".join([u'"%s"' % x for x in cmd_list])
63 self.run_cmd(cmdline)