071167e6a9
* Install required tool dependencies ('tar', 'rdiff', etc.)
* Run installed duplicity instead of source tree duplicity
* Fix shebang of scripts in testing/overrides/bin/
* Disable some unhelpful developer-only tests
* Disable a test broken on Linux (root cause unknown)
* Work around low file descriptor soft limit for Darwin builders
18 lines
669 B
Diff
18 lines
669 B
Diff
--- a/testing/functional/test_restart.py
|
|
+++ b/testing/functional/test_restart.py
|
|
@@ -323,14 +323,7 @@ class RestartTestWithoutEncryption(RestartTest):
|
|
https://launchpad.net/bugs/929067
|
|
"""
|
|
|
|
- if platform.system().startswith('Linux'):
|
|
- tarcmd = "tar"
|
|
- elif platform.system().startswith('Darwin'):
|
|
- tarcmd = "gtar"
|
|
- elif platform.system().endswith('BSD'):
|
|
- tarcmd = "gtar"
|
|
- else:
|
|
- raise Exception("Platform %s not supported by tar/gtar." % platform.platform())
|
|
+ tarcmd = "tar"
|
|
|
|
# Intial normal backup
|
|
self.backup("full", "testfiles/blocktartest")
|