From fd592dad573e9f0756119375e00da081af6eee85 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 14 Sep 2013 13:55:41 +0000 Subject: [PATCH] -dead test, gnunet-pseudonym is gone --- src/fs/Makefile.am | 3 +- src/fs/test_gnunet_fs_ns.py.in | 74 ---------------------------------- 2 files changed, 1 insertion(+), 76 deletions(-) delete mode 100755 src/fs/test_gnunet_fs_ns.py.in diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index 30a14e2c2..07d243ce5 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am @@ -269,8 +269,7 @@ if HAVE_PYTHON check_SCRIPTS = \ test_gnunet_fs_psd.py \ test_gnunet_fs_rec.py \ - test_gnunet_fs_idx.py \ - test_gnunet_fs_ns.py + test_gnunet_fs_idx.py endif if ENABLE_MONKEY diff --git a/src/fs/test_gnunet_fs_ns.py.in b/src/fs/test_gnunet_fs_ns.py.in deleted file mode 100755 index 738e595f0..000000000 --- a/src/fs/test_gnunet_fs_ns.py.in +++ /dev/null @@ -1,74 +0,0 @@ -#!@PYTHON@ -# This file is part of GNUnet. -# (C) 2010 Christian Grothoff (and other contributing authors) -# -# GNUnet is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; either version 2, or (at your -# option) any later version. -# -# GNUnet is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# 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., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. -# -# Testcase for file-sharing command-line tools (namespaces) -import sys -import os -import subprocess -import re -import shutil - -srcdir = "../.." -gnunet_pyexpect_dir = os.path.join (srcdir, "contrib") -if gnunet_pyexpect_dir not in sys.path: - sys.path.append (gnunet_pyexpect_dir) - -from gnunet_pyexpect import pexpect - -if os.name == 'posix': - pseudonym = './gnunet-pseudonym' - gnunetarm = 'gnunet-arm' - publish = './gnunet-publish' - unindex = './gnunet-unindex' - search = './gnunet-search' - identity = 'gnunet-identity' -elif os.name == 'nt': - pseudonym = './gnunet-pseudonym.exe' - gnunetarm = 'gnunet-arm.exe' - publish = './gnunet-publish.exe' - unindex = './gnunet-unindex.exe' - search = './gnunet-search.exe' - identity = 'gnunet-identity.exe' - -if os.name == "nt": - shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-ns"), True) -else: - shutil.rmtree ("/tmp/gnunet-test-fs-py-ns", True) - -arm = subprocess.Popen ([gnunetarm, '-sq', '-c', 'test_gnunet_fs_ns_data.conf']) -arm.communicate () - -try: - pseu = pexpect () - pseu.spawn (None, [identity, '-c', 'test_gnunet_fs_ns_data.conf', '-C', 'licenses'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - pseu.spawn (None, [pseudonym, '-c', 'test_gnunet_fs_ns_data.conf', '-A', 'licenses', '-k', 'gplad', '-m', 'description:Free Software Licenses', '-R', 'myroot'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - - s = pexpect () - s.spawn (None, [search, '-V', '-t', '1000 ms', '-N', '1', '-c', 'test_gnunet_fs_ns_data.conf', 'gplad'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - s.expect ("stdout", re.compile (r'#0:\r?\n')) - s.expect ("stdout", re.compile (r'gnunet-download gnunet://fs/sks/.*/myroot\r?\n')) - s.expect ("stdout", re.compile (r'\s*description: Free Software Licenses\r?\n')) - -finally: - arm = subprocess.Popen ([gnunetarm, '-eq', '-c', 'test_gnunet_fs_ns_data.conf']) - arm.communicate () - if os.name == "nt": - shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-ns"), True) - else: - shutil.rmtree ("/tmp/gnunet-test-fs-py-ns", True) -- 2.25.1