projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix #3904, also simplify and clean up gnunet-publish shutdown logic in general
[oweals/gnunet.git]
/
src
/
fs
/
test_gnunet_fs_rec.py.in
diff --git
a/src/fs/test_gnunet_fs_rec.py.in
b/src/fs/test_gnunet_fs_rec.py.in
index 09e55c144e63f94e748917cc77a5235e969500fb..3828a65c984bd77de5d609cc2d62453b6375f65f 100755
(executable)
--- a/
src/fs/test_gnunet_fs_rec.py.in
+++ b/
src/fs/test_gnunet_fs_rec.py.in
@@
-14,8
+14,8
@@
#
# You should have received a copy of the GNU General Public License
# along with GNUnet; see the file COPYING. If not, write to the
#
# You should have received a copy of the GNU General Public License
# along with GNUnet; see the file COPYING. If not, write to the
-# Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
-# Boston, MA 0211
1-1307
, USA.
+# Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+# Boston, MA 0211
0-1301
, USA.
#
# Testcase for file-sharing command-line tools (recursive publishing & download)
import sys
#
# Testcase for file-sharing command-line tools (recursive publishing & download)
import sys
@@
-25,7
+25,6
@@
import re
import shutil
import tarfile
import filecmp
import shutil
import tarfile
import filecmp
-import pydiffer
srcdir = "../.."
gnunet_pyexpect_dir = os.path.join (srcdir, "contrib")
srcdir = "../.."
gnunet_pyexpect_dir = os.path.join (srcdir, "contrib")
@@
-36,19
+35,19
@@
from gnunet_pyexpect import pexpect
from pydiffer import dcdiff
if os.name == 'posix':
from pydiffer import dcdiff
if os.name == 'posix':
- download = 'gnunet-download'
+ download = '
./
gnunet-download'
gnunetarm = 'gnunet-arm'
gnunetarm = 'gnunet-arm'
- publish = 'gnunet-publish'
- unindex = 'gnunet-unindex'
- search = 'gnunet-search'
- directory = 'gnunet-directory'
+ publish = '
./
gnunet-publish'
+ unindex = '
./
gnunet-unindex'
+ search = '
./
gnunet-search'
+ directory = '
./
gnunet-directory'
elif os.name == 'nt':
elif os.name == 'nt':
- download = 'gnunet-download.exe'
+ download = '
./
gnunet-download.exe'
gnunetarm = 'gnunet-arm.exe'
gnunetarm = 'gnunet-arm.exe'
- publish = 'gnunet-publish.exe'
- unindex = 'gnunet-unindex.exe'
- search = 'gnunet-search.exe'
- directory = 'gnunet-directory.exe'
+ publish = '
./
gnunet-publish.exe'
+ unindex = '
./
gnunet-unindex.exe'
+ search = '
./
gnunet-search.exe'
+ directory = '
./
gnunet-directory.exe'
if os.name == "nt":
shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-rec"), True)
if os.name == "nt":
shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-rec"), True)