April 2017 - tor-commits - lists.torproject.org

[stem/master] Use decorators for common test requirements
by atagar＠torproject.org 06 Apr '17

06 Apr '17

commit 0ee3864a784ce8e116466800329863d37ec35400 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 6 11:19:05 2017 -0700 Use decorators for common test requirements Expanding our use of decorators for testing requirements. This doesn't eliminate direct use of skipTest(), but restrict it to uncommon testing needs. --- test/integ/process.py | 7 +- test/integ/util/proc.py | 39 +++----- test/integ/util/system.py | 247 ++++++++++++++-------------------------------- test/integ/version.py | 10 +- test/unit/manual.py | 19 ++-- test/util.py | 14 +++ 6 files changed, 117 insertions(+), 219 deletions(-) diff --git a/test/integ/process.py b/test/integ/process.py index e77fdfb..b81a3bf 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -23,6 +23,7 @@ import stem.version import test.runner from test.util import ( + require_command, require_controller, require_version, ) @@ -198,6 +199,7 @@ class TestProcess(unittest.TestCase): self.assertTrue('UseBridges' in output) self.assertTrue('SocksPort' in output) + @require_command('sleep') @patch('re.compile', Mock(side_effect = KeyboardInterrupt('nope'))) def test_no_orphaned_process(self): """ @@ -430,6 +432,7 @@ class TestProcess(unittest.TestCase): if not (runtime > 0.05 and runtime < 1): self.fail('Test should have taken 0.05-1 seconds, took %0.1f instead' % runtime) + @require_command('sleep') @require_version(stem.version.Requirement.TAKEOWNERSHIP) @only_run_once @patch('os.getpid') @@ -439,10 +442,6 @@ class TestProcess(unittest.TestCase): test this we spawn a process and trick tor into thinking that it is us. """ - if not stem.util.system.is_available('sleep'): - self.skipTest("('sleep' command is unavailable)") - return - sleep_process = subprocess.Popen(['sleep', '60']) getpid_mock.return_value = str(sleep_process.pid) diff --git a/test/integ/util/proc.py b/test/integ/util/proc.py index a7e798d..ef3a7c0 100644 --- a/test/integ/util/proc.py +++ b/test/integ/util/proc.py @@ -10,45 +10,39 @@ import test.runner from stem.util import proc +from test.util import ( + require_proc, + require_ptrace, +) + class TestProc(unittest.TestCase): + @require_proc + @require_ptrace def test_cwd(self): """ Checks that stem.util.proc.cwd matches our tor instance's cwd. """ - if not proc.is_available(): - self.skipTest('(proc unavailable)') - return - elif not test.runner.get_runner().is_ptraceable(): - self.skipTest('(DisableDebuggerAttachment is set)') - return - runner = test.runner.get_runner() runner_pid, tor_cwd = runner.get_pid(), runner.get_tor_cwd() self.assertEqual(tor_cwd, proc.cwd(runner_pid)) + @require_proc def test_uid(self): """ Checks that stem.util.proc.uid matches our tor instance's uid. """ - if not proc.is_available(): - self.skipTest('(proc unavailable)') - return - tor_pid = test.runner.get_runner().get_pid() self.assertEqual(os.geteuid(), proc.uid(tor_pid)) + @require_proc def test_memory_usage(self): """ Checks that stem.util.proc.memory_usage looks somewhat reasonable. """ - if not proc.is_available(): - self.skipTest('(proc unavailable)') - return - tor_pid = test.runner.get_runner().get_pid() res_size, vir_size = proc.memory_usage(tor_pid) @@ -56,15 +50,12 @@ class TestProc(unittest.TestCase): self.assertTrue(res_size > 1024) self.assertTrue(vir_size > 1024) + @require_proc def test_stats(self): """ Checks that stem.util.proc.stats looks somewhat reasonable. """ - if not proc.is_available(): - self.skipTest('(proc unavailable)') - return - tor_cmd = test.runner.get_runner().get_tor_command(True) tor_pid = test.runner.get_runner().get_pid() command, utime, stime, start_time = proc.stats(tor_pid, 'command', 'utime', 'stime', 'start time') @@ -74,6 +65,8 @@ class TestProc(unittest.TestCase): self.assertTrue(float(stime) >= 0) self.assertTrue(float(start_time) > proc.system_start_time()) + @require_proc + @require_ptrace def test_connections(self): """ Checks for our control port in the stem.util.proc.connections output if @@ -82,15 +75,9 @@ class TestProc(unittest.TestCase): runner = test.runner.get_runner() - if not proc.is_available(): - self.skipTest('(proc unavailable)') - return - elif test.runner.Torrc.PORT not in runner.get_options(): + if test.runner.Torrc.PORT not in runner.get_options(): self.skiTestp('(no control port)') return - elif not test.runner.get_runner().is_ptraceable(): - self.skipTest('(DisableDebuggerAttachment is set)') - return elif not os.access('/proc/net/tcp', os.R_OK) or not os.access('/proc/net/udp', os.R_OK): self.skipTest('(proc lacks read permissions)') return diff --git a/test/integ/util/system.py b/test/integ/util/system.py index 973c3cb..88a5529 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -12,6 +12,13 @@ import stem.util.proc import stem.util.system import test.runner +from test.util import ( + require, + require_command, + require_proc, + require_ptrace, +) + try: # added in python 3.3 from unittest.mock import Mock, patch @@ -36,6 +43,23 @@ def filter_system_call(prefixes): return _filter_system_call +def _is_single_tor_running(): + if stem.util.system.is_windows(): + return True # TODO: not sure how to check for this on windows + elif not stem.util.system.is_bsd(): + tor_cmd = test.runner.get_runner().get_tor_command(True) + pgrep_results = stem.util.system.call(stem.util.system.GET_PID_BY_NAME_PGREP % tor_cmd) + return len(pgrep_results) == 1 + else: + ps_results = stem.util.system.call(stem.util.system.GET_PID_BY_NAME_PS_BSD) + results = [r for r in ps_results if r.endswith(' tor')] + return len(results) == 1 + + +def _is_linux(): + return not stem.util.system.is_bsd() and not stem.util.system.is_windows() + + def _has_port(): """ True if our test runner has a control port, False otherwise. @@ -44,6 +68,12 @@ def _has_port(): return test.runner.Torrc.PORT in test.runner.get_runner().get_options() +require_single_tor_instance = require(_is_single_tor_running, 'multiple tor instances') +require_control_port = require(_has_port, 'test instance has no port') +require_linux = require(_is_linux, 'linux only') +require_bsd = require(stem.util.system.is_bsd, 'bsd only') + + class TestSystem(unittest.TestCase): def test_is_available(self): """ @@ -61,15 +91,12 @@ class TestSystem(unittest.TestCase): self.assertFalse(stem.util.system.is_available('blarg_and_stuff')) + @require_command('ps') def test_is_running(self): """ Checks the stem.util.system.is_running function. """ - if not stem.util.system.is_available('ps'): - self.skipTest('(ps unavailable)') - return - # Check to see if the command we started tor with is running. The process # might be running under another name so need to check for 'tor.real' too # (#15449). @@ -78,35 +105,26 @@ class TestSystem(unittest.TestCase): self.assertTrue(stem.util.system.is_running(tor_cmd) or stem.util.system.is_running('tor.real')) self.assertFalse(stem.util.system.is_running('blarg_and_stuff')) + @require_single_tor_instance def test_pid_by_name(self): """ Checks general usage of the stem.util.system.pid_by_name function. This will fail if there's other tor instances running. """ - if self._is_extra_tor_running(): - self.skipTest('(multiple tor instances)') - return - tor_pid = test.runner.get_runner().get_pid() tor_cmd = test.runner.get_runner().get_tor_command(True) self.assertEqual(tor_pid, stem.util.system.pid_by_name(tor_cmd)) self.assertEqual(None, stem.util.system.pid_by_name('blarg_and_stuff')) + @require_command('pgrep') + @require_single_tor_instance def test_pid_by_name_pgrep(self): """ Tests the pid_by_name function with a pgrep response. """ - if self._is_extra_tor_running(): - self.skipTest('(multiple tor instances)') - return - elif not stem.util.system.is_available('pgrep'): - self.skipTest('(pgrep unavailable)') - return - pgrep_prefix = stem.util.system.GET_PID_BY_NAME_PGREP % '' - call_replacement = filter_system_call([pgrep_prefix]) with patch('stem.util.system.call') as call_mock: @@ -116,20 +134,14 @@ class TestSystem(unittest.TestCase): tor_cmd = test.runner.get_runner().get_tor_command(True) self.assertEqual(tor_pid, stem.util.system.pid_by_name(tor_cmd)) + @require_command('pidof') + @require_single_tor_instance def test_pid_by_name_pidof(self): """ Tests the pid_by_name function with a pidof response. """ - if self._is_extra_tor_running(): - self.skipTest('(multiple tor instances)') - return - elif not stem.util.system.is_available('pidof'): - self.skipTest('(pidof unavailable)') - return - pidof_prefix = stem.util.system.GET_PID_BY_NAME_PIDOF % '' - call_replacement = filter_system_call([pidof_prefix]) with patch('stem.util.system.call') as call_mock: @@ -139,23 +151,15 @@ class TestSystem(unittest.TestCase): tor_cmd = test.runner.get_runner().get_tor_command() self.assertEqual(tor_pid, stem.util.system.pid_by_name(tor_cmd)) + @require_linux + @require_command('ps') + @require_single_tor_instance def test_pid_by_name_ps_linux(self): """ Tests the pid_by_name function with the linux variant of ps. """ - if self._is_extra_tor_running(): - self.skipTest('(multiple tor instances)') - return - elif not stem.util.system.is_available('ps'): - self.skipTest('(ps unavailable)') - return - elif stem.util.system.is_bsd(): - self.skipTest('(linux only)') - return - ps_prefix = stem.util.system.GET_PID_BY_NAME_PS_LINUX % '' - call_replacement = filter_system_call([ps_prefix]) with patch('stem.util.system.call') as call_mock: @@ -165,23 +169,15 @@ class TestSystem(unittest.TestCase): tor_cmd = test.runner.get_runner().get_tor_command(True) self.assertEqual(tor_pid, stem.util.system.pid_by_name(tor_cmd)) + @require_bsd + @require_command('ps') + @require_single_tor_instance def test_pid_by_name_ps_bsd(self): """ Tests the pid_by_name function with the bsd variant of ps. """ - if self._is_extra_tor_running(): - self.skipTest('(multiple tor instances)') - return - elif not stem.util.system.is_available('ps'): - self.skipTest('(ps unavailable)') - return - elif not stem.util.system.is_bsd(): - self.skipTest('(bsd only)') - return - ps_prefix = stem.util.system.GET_PID_BY_NAME_PS_BSD - call_replacement = filter_system_call([ps_prefix]) with patch('stem.util.system.call') as call_mock: @@ -191,24 +187,15 @@ class TestSystem(unittest.TestCase): tor_cmd = test.runner.get_runner().get_tor_command(True) self.assertEqual(tor_pid, stem.util.system.pid_by_name(tor_cmd)) + @require_ptrace + @require_command('lsof') + @require_single_tor_instance def test_pid_by_name_lsof(self): """ Tests the pid_by_name function with a lsof response. """ - runner = test.runner.get_runner() - if self._is_extra_tor_running(): - self.skipTest('(multiple tor instances)') - return - elif not stem.util.system.is_available('lsof'): - self.skipTest('(lsof unavailable)') - return - elif not runner.is_ptraceable(): - self.skipTest('(DisableDebuggerAttachment is set)') - return - lsof_prefix = stem.util.system.GET_PID_BY_NAME_LSOF % '' - call_replacement = filter_system_call([lsof_prefix]) with patch('stem.util.system.call') as call_mock: @@ -221,71 +208,52 @@ class TestSystem(unittest.TestCase): if len(all_tor_pids) == 1: self.assertEqual(our_tor_pid, all_tor_pids[0]) + @require_command('tasklist') + @require_single_tor_instance def test_pid_by_name_tasklist(self): """ Tests the pid_by_name function with a tasklist response. """ - if self._is_extra_tor_running(): - self.skipTest('(multiple tor instances)') - return - elif not stem.util.system.is_available('tasklist'): - self.skipTest('(tasklist unavailable)') - return - runner = test.runner.get_runner() self.assertEqual(runner.get_pid(), stem.util.system.pid_by_name(runner.get_tor_command(True))) + @require_ptrace + @require_control_port def test_pid_by_port(self): """ Checks general usage of the stem.util.system.pid_by_port function. """ - runner = test.runner.get_runner() if stem.util.system.is_windows(): self.skipTest('(unavailable on windows)') return - elif not _has_port(): - self.skipTest('(test instance has no port)') - return elif stem.util.system.is_mac() or stem.util.system.is_gentoo(): self.skipTest('(resolvers unavailable)') return - elif not runner.is_ptraceable(): - self.skipTest('(DisableDebuggerAttachment is set)') - return elif not (stem.util.system.is_available('netstat') or stem.util.system.is_available('sockstat') or stem.util.system.is_available('lsof')): self.skipTest('(connection resolvers unavailable)') return + runner = test.runner.get_runner() tor_pid, tor_port = runner.get_pid(), test.runner.CONTROL_PORT self.assertEqual(tor_pid, stem.util.system.pid_by_port(tor_port)) self.assertEqual(None, stem.util.system.pid_by_port(99999)) + @require_linux + @require_ptrace + @require_control_port + @require_command('netstat') def test_pid_by_port_netstat(self): """ Tests the pid_by_port function with a netstat response. """ - runner = test.runner.get_runner() - - if not _has_port(): - self.skipTest('(test instance has no port)') - return - elif not stem.util.system.is_available('netstat'): - self.skipTest('(netstat unavailable)') - return - elif stem.util.system.is_bsd() or stem.util.system.is_windows(): - self.skipTest('(linux only)') - return - elif stem.util.system.is_gentoo(): + if stem.util.system.is_gentoo(): self.skipTest('(unavailable on gentoo)') return - elif not runner.is_ptraceable(): - self.skipTest('(DisableDebuggerAttachment is set)') - return netstat_prefix = stem.util.system.GET_PID_BY_PORT_NETSTAT @@ -297,28 +265,16 @@ class TestSystem(unittest.TestCase): tor_pid = test.runner.get_runner().get_pid() self.assertEqual(tor_pid, stem.util.system.pid_by_port(test.runner.CONTROL_PORT)) + @require_bsd + @require_ptrace + @require_control_port + @require_command('sockstat') def test_pid_by_port_sockstat(self): """ Tests the pid_by_port function with a sockstat response. """ - runner = test.runner.get_runner() - - if not _has_port(): - self.skipTest('(test instance has no port)') - return - elif not stem.util.system.is_available('sockstat'): - self.skipTest('(sockstat unavailable)') - return - elif not stem.util.system.is_bsd(): - self.skipTest('(bsd only)') - return - elif not runner.is_ptraceable(): - self.skipTest('(DisableDebuggerAttachment is set)') - return - sockstat_prefix = stem.util.system.GET_PID_BY_PORT_SOCKSTAT % '' - call_replacement = filter_system_call([sockstat_prefix]) with patch('stem.util.system.call') as call_mock: @@ -327,25 +283,17 @@ class TestSystem(unittest.TestCase): tor_pid = test.runner.get_runner().get_pid() self.assertEqual(tor_pid, stem.util.system.pid_by_port(test.runner.CONTROL_PORT)) + @require_ptrace + @require_control_port + @require_command('lsof') def test_pid_by_port_lsof(self): """ Tests the pid_by_port function with a lsof response. """ - runner = test.runner.get_runner() - - if not _has_port(): - self.skipTest('(test instance has no port)') - return - elif not stem.util.system.is_available('lsof'): - self.skipTest('(lsof unavailable)') - return - elif stem.util.system.is_mac() or stem.util.system.is_gentoo(): + if stem.util.system.is_mac() or stem.util.system.is_gentoo(): self.skipTest('(resolvers unavailable)') return - elif not runner.is_ptraceable(): - self.skipTest('(DisableDebuggerAttachment is set)') - return lsof_prefix = stem.util.system.GET_PID_BY_PORT_LSOF @@ -380,38 +328,28 @@ class TestSystem(unittest.TestCase): pids = stem.util.system.pids_by_user(getpass.getuser()) self.assertTrue(os.getpid() in pids) + @require_ptrace def test_cwd(self): """ Checks general usage of the stem.util.system.cwd function. """ - runner = test.runner.get_runner() - if stem.util.system.is_windows(): self.skipTest('(unavailable on windows)') return - elif not runner.is_ptraceable(): - self.skipTest('(DisableDebuggerAttachment is set)') - return + runner = test.runner.get_runner() runner_pid, tor_cwd = runner.get_pid(), runner.get_tor_cwd() self.assertEqual(tor_cwd, stem.util.system.cwd(runner_pid)) self.assertEqual(None, stem.util.system.cwd(99999)) + @require_ptrace + @require_command('pwdx') def test_cwd_pwdx(self): """ Tests the pid_by_cwd function with a pwdx response. """ - runner = test.runner.get_runner() - - if not stem.util.system.is_available('pwdx'): - self.skipTest('(pwdx unavailable)') - return - elif not runner.is_ptraceable(): - self.skipTest('(DisableDebuggerAttachment is set)') - return - # filter the call function to only allow this command pwdx_prefix = stem.util.system.GET_CWD_PWDX % '' @@ -421,23 +359,17 @@ class TestSystem(unittest.TestCase): with patch('stem.util.system.call') as call_mock: call_mock.side_effect = call_replacement + runner = test.runner.get_runner() runner_pid, tor_cwd = runner.get_pid(), runner.get_tor_cwd() self.assertEqual(tor_cwd, stem.util.system.cwd(runner_pid)) + @require_ptrace + @require_command('lsof') def test_cwd_lsof(self): """ Tests the pid_by_cwd function with a lsof response. """ - runner = test.runner.get_runner() - - if not stem.util.system.is_available('lsof'): - self.skipTest('(lsof unavailable)') - return - elif not runner.is_ptraceable(): - self.skipTest('(DisableDebuggerAttachment is set)') - return - # filter the call function to only allow this command lsof_prefix = 'lsof -a -p ' @@ -447,6 +379,7 @@ class TestSystem(unittest.TestCase): with patch('stem.util.system.call') as call_mock: call_mock.side_effect = call_replacement + runner = test.runner.get_runner() runner_pid, tor_cwd = runner.get_pid(), runner.get_tor_cwd() self.assertEqual(tor_cwd, stem.util.system.cwd(runner_pid)) @@ -459,15 +392,12 @@ class TestSystem(unittest.TestCase): self.assertEqual(None, stem.util.system.user(-5)) self.assertEqual(None, stem.util.system.start_time(98765)) + @require_proc def test_user_proc(self): """ Tests the user function with a proc response. """ - if not stem.util.proc.is_available(): - self.skipTest('(proc unavailable)') - return - call_replacement = filter_system_call(['ps ']) with patch('stem.util.system.call') as call_mock: @@ -478,16 +408,13 @@ class TestSystem(unittest.TestCase): pid = test.runner.get_runner().get_pid() self.assertTrue(getpass.getuser(), stem.util.system.user(pid)) + @require_command('ps') @patch('stem.util.proc.is_available', Mock(return_value = False)) def test_user_ps(self): """ Tests the user function with a ps response. """ - if not stem.util.system.is_available('ps'): - self.skipTest('(ps unavailable)') - return - pid = test.runner.get_runner().get_pid() self.assertTrue(getpass.getuser(), stem.util.system.user(pid)) @@ -500,15 +427,12 @@ class TestSystem(unittest.TestCase): self.assertEqual(None, stem.util.system.start_time(-5)) self.assertEqual(None, stem.util.system.start_time(98765)) + @require_proc def test_start_time_proc(self): """ Tests the start_time function with a proc response. """ - if not stem.util.proc.is_available(): - self.skipTest('(proc unavailable)') - return - call_replacement = filter_system_call(['ps ']) with patch('stem.util.system.call') as call_mock: @@ -517,16 +441,13 @@ class TestSystem(unittest.TestCase): pid = test.runner.get_runner().get_pid() self.assertTrue(stem.util.system.start_time(pid) >= 0) + @require_command('ps') @patch('stem.util.proc.is_available', Mock(return_value = False)) def test_start_time_ps(self): """ Tests the start_time function with a ps response. """ - if not stem.util.system.is_available('ps'): - self.skipTest('(ps unavailable)') - return - pid = test.runner.get_runner().get_pid() self.assertTrue(stem.util.system.start_time(pid) >= 0) @@ -592,21 +513,3 @@ class TestSystem(unittest.TestCase): self.assertEqual('stem_integ', stem.util.system.get_process_name()) finally: stem.util.system.set_process_name(initial_name) - - def _is_extra_tor_running(self): - # Try to figure out if there's more than one tor instance running. This - # check will fail if pgrep is unavailable (for instance on bsd) but this - # isn't the end of the world. It's just used to skip tests if they should - # legitemately fail. - - if stem.util.system.is_windows(): - # TODO: not sure how to check for this on windows - return False - elif not stem.util.system.is_bsd(): - tor_cmd = test.runner.get_runner().get_tor_command(True) - pgrep_results = stem.util.system.call(stem.util.system.GET_PID_BY_NAME_PGREP % tor_cmd) - return len(pgrep_results) > 1 - else: - ps_results = stem.util.system.call(stem.util.system.GET_PID_BY_NAME_PS_BSD) - results = [r for r in ps_results if r.endswith(' tor')] - return len(results) > 1 diff --git a/test/integ/version.py b/test/integ/version.py index 35e016a..3cef9b2 100644 --- a/test/integ/version.py +++ b/test/integ/version.py @@ -9,19 +9,19 @@ import stem.prereq import stem.version import test.runner -from test.util import require_controller +from test.util import ( + require_command, + require_controller, +) class TestVersion(unittest.TestCase): + @require_command('tor') def test_get_system_tor_version(self): """ Basic verification checks for the get_system_tor_version() function. """ - if not stem.util.system.is_available('tor'): - self.skipTest("(tor isn't in our path)") - return - # Since tor is in our path we should expect to be able to get the version # that way, though this might not belong to our test instance (if we're # running against a specific tor binary). diff --git a/test/unit/manual.py b/test/unit/manual.py index 6d0c174..9e6904e 100644 --- a/test/unit/manual.py +++ b/test/unit/manual.py @@ -12,6 +12,8 @@ import stem.prereq import stem.manual import stem.util.system +from test.util import require_command + try: # account for urllib's change between python 2.x and 3.x import urllib.request as urllib @@ -150,6 +152,7 @@ class TestManual(unittest.TestCase): self.assertEqual('', blank.summary) self.assertEqual('', blank.description) + @require_command('man') def test_parsing_with_example(self): """ Read a trimmed copy of tor's man page. This gives a good exercise of our @@ -157,10 +160,7 @@ class TestManual(unittest.TestCase): expand our example (or add another). """ - if not stem.util.system.is_available('man'): - self.skipTest('(require man command)') - return - elif stem.util.system.is_mac(): + if stem.util.system.is_mac(): self.skipTest('(man lacks --encoding arg on OSX, #18660)') return @@ -174,16 +174,14 @@ class TestManual(unittest.TestCase): self.assertEqual(EXPECTED_FILES, manual.files) self.assertEqual(EXPECTED_CONFIG_OPTIONS, manual.config_options) + @require_command('man') def test_parsing_with_unknown_options(self): """ Check that we can read a local mock man page that contains unrecognized options. Unlike most other tests this doesn't require network access. """ - if not stem.util.system.is_available('man'): - self.skipTest('(require man command)') - return - elif stem.util.system.is_mac(): + if stem.util.system.is_mac(): self.skipTest('(man lacks --encoding arg on OSX, #18660)') return @@ -205,15 +203,12 @@ class TestManual(unittest.TestCase): self.assertEqual('', option.summary) self.assertEqual('Description of this new option.', option.description) + @require_command('man') def test_saving_manual(self): """ Check that we can save and reload manuals. """ - if not stem.util.system.is_available('man'): - self.skipTest('(require man command)') - return - manual = stem.manual.Manual.from_man(EXAMPLE_MAN_PATH) with tempfile.NamedTemporaryFile(prefix = 'saved_test_manual.') as tmp: diff --git a/test/util.py b/test/util.py index 2468b55..864baab 100644 --- a/test/util.py +++ b/test/util.py @@ -24,9 +24,12 @@ Tasks are... | |- require_cryptography - skips test unless the cryptography module is present |- require_pynacl - skips test unless the pynacl module is present + |- require_command - requires a command to be on the path + |- require_proc - requires the platform to have recognized /proc contents | |- require_controller - skips test unless tor provides a controller endpoint |- require_version - skips test unless we meet a tor version requirement + |- require_ptrace - requires 'DisableDebuggerAttachment' to be set +- require_online - skips unless targets allow for online tests Initialization @@ -255,6 +258,7 @@ def require(condition, message): require_cryptography = require(stem.prereq.is_crypto_available, 'requires cryptography') require_pynacl = require(stem.prereq._is_pynacl_available, 'requires pynacl module') +require_proc = require(stem.util.proc.is_available, 'proc unavailable') def require_controller(func): @@ -271,6 +275,14 @@ def require_controller(func): return wrapped +def require_command(cmd): + """ + Skips the test unless a command is available on the path. + """ + + return require(lambda: stem.util.system.is_available(cmd), '%s unavailable' % cmd) + + def require_version(req_version): """ Skips the test unless we meet the required version. @@ -526,3 +538,5 @@ class Task(object): import test.runner # needs to be imported at the end to avoid a circular dependency + +require_ptrace = require(test.runner.get_runner().is_ptraceable, 'DisableDebuggerAttachment is set')

1 0

[stem/master] Replace skip helper with builtin
by atagar＠torproject.org 06 Apr '17

06 Apr '17

commit 0faa9dc5af392bad7a4c0fa73e28a5c186b65e9c Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Apr 5 11:02:01 2017 -0700 Replace skip helper with builtin Long ago I added a skip helper because python 2.6 doesn't have this method. Now that we vend a TimedTestRunner we can add this capability directly to that. This will make removal of python 2.6 support easier later (all we gotta do is drop the unnecessary return statements). --- stem/util/test_tools.py | 7 ++ test/integ/control/base_controller.py | 9 +-- test/integ/control/controller.py | 9 ++- test/integ/descriptor/extrainfo_descriptor.py | 3 +- test/integ/descriptor/microdescriptor.py | 3 +- test/integ/descriptor/networkstatus.py | 9 ++- test/integ/descriptor/remote.py | 3 +- test/integ/descriptor/server_descriptor.py | 3 +- test/integ/installation.py | 7 +- test/integ/manual.py | 3 +- test/integ/process.py | 3 +- test/integ/util/connection.py | 7 +- test/integ/util/proc.py | 19 +++--- test/integ/util/system.py | 97 ++++++++++++++------------- test/integ/version.py | 7 +- test/unit/descriptor/export.py | 5 +- test/unit/descriptor/reader.py | 11 ++- test/unit/installation.py | 6 +- test/unit/manual.py | 12 ++-- test/unit/tutorial_examples.py | 3 +- test/util.py | 25 ++----- 21 files changed, 109 insertions(+), 142 deletions(-) diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py index 2600413..0b44d3a 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -71,6 +71,13 @@ class TimedTestRunner(unittest.TextTestRunner): TEST_RUNTIMES[self.id()] = time.time() - start_time return result + # TODO: remove and drop unnecessary 'returns' when dropping python 2.6 + # support + + def skipTest(self, message): + if not stem.prereq._is_python_26(): + return super(original_type, self).skipTest(message) + # TODO: remove when dropping python 2.6 support def assertRaisesRegexp(self, exc_type, exc_msg, func, *args, **kwargs): diff --git a/test/integ/control/base_controller.py b/test/integ/control/base_controller.py index 78e6e3e..0a51e1f 100644 --- a/test/integ/control/base_controller.py +++ b/test/integ/control/base_controller.py @@ -14,10 +14,7 @@ import stem.util.system import test.mocking import test.runner -from test.util import ( - skip, - require_controller, -) +from test.util import require_controller class StateObserver(object): @@ -50,7 +47,7 @@ class TestBaseController(unittest.TestCase): """ if stem.util.system.is_mac(): - skip(self, '(ticket #6235)') + self.skipTest('(ticket #6235)') return with test.runner.get_runner().get_tor_socket() as control_socket: @@ -100,7 +97,7 @@ class TestBaseController(unittest.TestCase): """ if stem.util.system.is_mac(): - skip(self, '(ticket #6235)') + self.skipTest('(ticket #6235)') return with test.runner.get_runner().get_tor_socket() as control_socket: diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 877c40b..48a50fe 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -30,7 +30,6 @@ from stem.version import Requirement from test.util import ( register_new_capability, tor_version, - skip, only_run_once, require_controller, require_version, @@ -1126,7 +1125,7 @@ class TestController(unittest.TestCase): runner = test.runner.get_runner() if not os.path.exists(runner.get_test_dir('cached-descriptors')): - skip(self, '(no cached microdescriptors)') + self.skipTest('(no cached microdescriptors)') return with runner.get_tor_controller() as controller: @@ -1148,7 +1147,7 @@ class TestController(unittest.TestCase): runner = test.runner.get_runner() if tor_version() >= Requirement.MICRODESCRIPTOR_IS_DEFAULT: - skip(self, '(requires server descriptors)') + self.skipTest('(requires server descriptors)') return with runner.get_tor_controller() as controller: @@ -1178,7 +1177,7 @@ class TestController(unittest.TestCase): runner = test.runner.get_runner() if tor_version() >= Requirement.MICRODESCRIPTOR_IS_DEFAULT: - skip(self, '(requires server descriptors)') + self.skipTest('(requires server descriptors)') return with runner.get_tor_controller() as controller: @@ -1358,7 +1357,7 @@ class TestController(unittest.TestCase): if TEST_ROUTER_STATUS_ENTRY is None: # this is only likely to occure if we can't get descriptors - skip(self, '(no named relays)') + self.skipTest('(no named relays)') return return TEST_ROUTER_STATUS_ENTRY diff --git a/test/integ/descriptor/extrainfo_descriptor.py b/test/integ/descriptor/extrainfo_descriptor.py index 2ac44fe..6ea2b16 100644 --- a/test/integ/descriptor/extrainfo_descriptor.py +++ b/test/integ/descriptor/extrainfo_descriptor.py @@ -10,7 +10,6 @@ import test.runner from test.util import ( register_new_capability, - skip, only_run_once, ) @@ -27,7 +26,7 @@ class TestExtraInfoDescriptor(unittest.TestCase): descriptor_path = test.runner.get_runner().get_test_dir('cached-extrainfo') if not os.path.exists(descriptor_path): - skip(self, '(no cached descriptors)') + self.skipTest('(no cached descriptors)') return with open(descriptor_path, 'rb') as descriptor_file: diff --git a/test/integ/descriptor/microdescriptor.py b/test/integ/descriptor/microdescriptor.py index b1796c2..97127d6 100644 --- a/test/integ/descriptor/microdescriptor.py +++ b/test/integ/descriptor/microdescriptor.py @@ -10,7 +10,6 @@ import test.runner from test.util import ( register_new_capability, - skip, only_run_once, ) @@ -27,7 +26,7 @@ class TestMicrodescriptor(unittest.TestCase): descriptor_path = test.runner.get_runner().get_test_dir('cached-microdescs') if not os.path.exists(descriptor_path): - skip(self, '(no cached microdescriptors)') + self.skipTest('(no cached microdescriptors)') return with open(descriptor_path, 'rb') as descriptor_file: diff --git a/test/integ/descriptor/networkstatus.py b/test/integ/descriptor/networkstatus.py index e6bdce2..72d503a 100644 --- a/test/integ/descriptor/networkstatus.py +++ b/test/integ/descriptor/networkstatus.py @@ -13,7 +13,6 @@ import test.runner from test.util import ( register_new_capability, - skip, only_run_once, ) @@ -28,13 +27,13 @@ class TestNetworkStatus(unittest.TestCase): consensus_path = test.runner.get_runner().get_test_dir('cached-consensus') if not os.path.exists(consensus_path): - skip(self, '(no cached-consensus)') + self.skipTest('(no cached-consensus)') return elif stem.util.system.is_windows(): # Unable to check memory usage on windows, so can't prevent hanging the # system if things go bad. - skip(self, '(unavailable on windows)') + self.skipTest('(unavailable on windows)') return count, reported_flags = 0, [] @@ -65,10 +64,10 @@ class TestNetworkStatus(unittest.TestCase): consensus_path = test.runner.get_runner().get_test_dir('cached-microdesc-consensus') if not os.path.exists(consensus_path): - skip(self, '(no cached-microdesc-consensus)') + self.skipTest('(no cached-microdesc-consensus)') return elif stem.util.system.is_windows(): - skip(self, '(unavailable on windows)') + self.skipTest('(unavailable on windows)') return count, reported_flags = 0, [] diff --git a/test/integ/descriptor/remote.py b/test/integ/descriptor/remote.py index cd18187..b873b96 100644 --- a/test/integ/descriptor/remote.py +++ b/test/integ/descriptor/remote.py @@ -12,7 +12,6 @@ import stem.descriptor.router_status_entry import stem.descriptor.server_descriptor from test.util import ( - skip, only_run_once, require_online, ) @@ -247,7 +246,7 @@ class TestDescriptorDownloader(unittest.TestCase): # Don't run this test by default. Once upon a time it was fine, but tor has # added so many fallbacks now that this takes a looong time. :( - skip(self, '(skipped by default)') + self.skipTest('(skipped by default)') return unsuccessful = {} diff --git a/test/integ/descriptor/server_descriptor.py b/test/integ/descriptor/server_descriptor.py index 302cef1..bd61e70 100644 --- a/test/integ/descriptor/server_descriptor.py +++ b/test/integ/descriptor/server_descriptor.py @@ -11,7 +11,6 @@ import test.runner from test.util import ( register_new_capability, - skip, only_run_once, ) @@ -28,7 +27,7 @@ class TestServerDescriptor(unittest.TestCase): descriptor_path = test.runner.get_runner().get_test_dir('cached-descriptors') if not os.path.exists(descriptor_path): - skip(self, '(no cached descriptors)') + self.skipTest('(no cached descriptors)') return with open(descriptor_path, 'rb') as descriptor_file: diff --git a/test/integ/installation.py b/test/integ/installation.py index 72f2df4..ad21fd0 100644 --- a/test/integ/installation.py +++ b/test/integ/installation.py @@ -11,10 +11,7 @@ import stem.util.system import test.util -from test.util import ( - skip, - only_run_once, -) +from test.util import only_run_once INSTALL_MISMATCH_MSG = "Running 'python setup.py sdist' doesn't match our git contents in the following way. The manifest in our setup.py may need to be updated...\n\n" @@ -134,7 +131,7 @@ class TestInstallation(unittest.TestCase): """ if not stem.util.system.is_available('git'): - skip(self, '(git unavailable)') + self.skipTest('(git unavailable)') return setup().join() diff --git a/test/integ/manual.py b/test/integ/manual.py index 187cde9..f9d4dbd 100644 --- a/test/integ/manual.py +++ b/test/integ/manual.py @@ -13,7 +13,6 @@ import stem.util.system import test.runner from stem.manual import Category -from test.util import skip EXPECTED_CATEGORIES = set([ 'NAME', @@ -120,7 +119,7 @@ class TestManual(unittest.TestCase): def requires_downloaded_manual(self): if self.skip_reason: - skip(self, self.skip_reason) + self.skipTest(self.skip_reason) return True elif self.download_error: self.fail(self.download_error) diff --git a/test/integ/process.py b/test/integ/process.py index 4cc79e3..e77fdfb 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -23,7 +23,6 @@ import stem.version import test.runner from test.util import ( - skip, require_controller, require_version, ) @@ -441,7 +440,7 @@ class TestProcess(unittest.TestCase): """ if not stem.util.system.is_available('sleep'): - skip(self, "('sleep' command is unavailable)") + self.skipTest("('sleep' command is unavailable)") return sleep_process = subprocess.Popen(['sleep', '60']) diff --git a/test/integ/util/connection.py b/test/integ/util/connection.py index 1145169..63f62ff 100644 --- a/test/integ/util/connection.py +++ b/test/integ/util/connection.py @@ -8,7 +8,6 @@ import unittest import test.runner from stem.util.connection import Resolver, get_connections, system_resolvers -from test.util import skip class TestConnection(unittest.TestCase): @@ -16,13 +15,13 @@ class TestConnection(unittest.TestCase): runner = test.runner.get_runner() if test.runner.Torrc.PORT not in runner.get_options(): - skip(self, '(no control port)') + self.skipTest('(no control port)') return elif not runner.is_ptraceable(): - skip(self, '(DisableDebuggerAttachment set)') + self.skipTest('(DisableDebuggerAttachment set)') return elif resolver not in system_resolvers(): - skip(self, '(resolver unavailable on this platform)') + self.skipTest('(resolver unavailable on this platform)') return with runner.get_tor_socket(): diff --git a/test/integ/util/proc.py b/test/integ/util/proc.py index 4671b3d..a7e798d 100644 --- a/test/integ/util/proc.py +++ b/test/integ/util/proc.py @@ -9,7 +9,6 @@ import unittest import test.runner from stem.util import proc -from test.util import skip class TestProc(unittest.TestCase): @@ -19,10 +18,10 @@ class TestProc(unittest.TestCase): """ if not proc.is_available(): - skip(self, '(proc unavailable)') + self.skipTest('(proc unavailable)') return elif not test.runner.get_runner().is_ptraceable(): - skip(self, '(DisableDebuggerAttachment is set)') + self.skipTest('(DisableDebuggerAttachment is set)') return runner = test.runner.get_runner() @@ -35,7 +34,7 @@ class TestProc(unittest.TestCase): """ if not proc.is_available(): - skip(self, '(proc unavailable)') + self.skipTest('(proc unavailable)') return tor_pid = test.runner.get_runner().get_pid() @@ -47,7 +46,7 @@ class TestProc(unittest.TestCase): """ if not proc.is_available(): - skip(self, '(proc unavailable)') + self.skipTest('(proc unavailable)') return tor_pid = test.runner.get_runner().get_pid() @@ -63,7 +62,7 @@ class TestProc(unittest.TestCase): """ if not proc.is_available(): - skip(self, '(proc unavailable)') + self.skipTest('(proc unavailable)') return tor_cmd = test.runner.get_runner().get_tor_command(True) @@ -84,16 +83,16 @@ class TestProc(unittest.TestCase): runner = test.runner.get_runner() if not proc.is_available(): - skip(self, '(proc unavailable)') + self.skipTest('(proc unavailable)') return elif test.runner.Torrc.PORT not in runner.get_options(): - skip(self, '(no control port)') + self.skiTestp('(no control port)') return elif not test.runner.get_runner().is_ptraceable(): - skip(self, '(DisableDebuggerAttachment is set)') + self.skipTest('(DisableDebuggerAttachment is set)') return elif not os.access('/proc/net/tcp', os.R_OK) or not os.access('/proc/net/udp', os.R_OK): - skip(self, '(proc lacks read permissions)') + self.skipTest('(proc lacks read permissions)') return # making a controller connection so that we have something to query for diff --git a/test/integ/util/system.py b/test/integ/util/system.py index eee2ccb..973c3cb 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -12,8 +12,6 @@ import stem.util.proc import stem.util.system import test.runner -from test.util import skip - try: # added in python 3.3 from unittest.mock import Mock, patch @@ -69,7 +67,7 @@ class TestSystem(unittest.TestCase): """ if not stem.util.system.is_available('ps'): - skip(self, '(ps unavailable)') + self.skipTest('(ps unavailable)') return # Check to see if the command we started tor with is running. The process @@ -87,7 +85,7 @@ class TestSystem(unittest.TestCase): """ if self._is_extra_tor_running(): - skip(self, '(multiple tor instances)') + self.skipTest('(multiple tor instances)') return tor_pid = test.runner.get_runner().get_pid() @@ -101,10 +99,10 @@ class TestSystem(unittest.TestCase): """ if self._is_extra_tor_running(): - skip(self, '(multiple tor instances)') + self.skipTest('(multiple tor instances)') return elif not stem.util.system.is_available('pgrep'): - skip(self, '(pgrep unavailable)') + self.skipTest('(pgrep unavailable)') return pgrep_prefix = stem.util.system.GET_PID_BY_NAME_PGREP % '' @@ -124,10 +122,10 @@ class TestSystem(unittest.TestCase): """ if self._is_extra_tor_running(): - skip(self, '(multiple tor instances)') + self.skipTest('(multiple tor instances)') return elif not stem.util.system.is_available('pidof'): - skip(self, '(pidof unavailable)') + self.skipTest('(pidof unavailable)') return pidof_prefix = stem.util.system.GET_PID_BY_NAME_PIDOF % '' @@ -147,13 +145,13 @@ class TestSystem(unittest.TestCase): """ if self._is_extra_tor_running(): - skip(self, '(multiple tor instances)') + self.skipTest('(multiple tor instances)') return elif not stem.util.system.is_available('ps'): - skip(self, '(ps unavailable)') + self.skipTest('(ps unavailable)') return elif stem.util.system.is_bsd(): - skip(self, '(linux only)') + self.skipTest('(linux only)') return ps_prefix = stem.util.system.GET_PID_BY_NAME_PS_LINUX % '' @@ -173,13 +171,13 @@ class TestSystem(unittest.TestCase): """ if self._is_extra_tor_running(): - skip(self, '(multiple tor instances)') + self.skipTest('(multiple tor instances)') return elif not stem.util.system.is_available('ps'): - skip(self, '(ps unavailable)') + self.skipTest('(ps unavailable)') return elif not stem.util.system.is_bsd(): - skip(self, '(bsd only)') + self.skipTest('(bsd only)') return ps_prefix = stem.util.system.GET_PID_BY_NAME_PS_BSD @@ -200,13 +198,13 @@ class TestSystem(unittest.TestCase): runner = test.runner.get_runner() if self._is_extra_tor_running(): - skip(self, '(multiple tor instances)') + self.skipTest('(multiple tor instances)') return elif not stem.util.system.is_available('lsof'): - skip(self, '(lsof unavailable)') + self.skipTest('(lsof unavailable)') return elif not runner.is_ptraceable(): - skip(self, '(DisableDebuggerAttachment is set)') + self.skipTest('(DisableDebuggerAttachment is set)') return lsof_prefix = stem.util.system.GET_PID_BY_NAME_LSOF % '' @@ -229,10 +227,10 @@ class TestSystem(unittest.TestCase): """ if self._is_extra_tor_running(): - skip(self, '(multiple tor instances)') + self.skipTest('(multiple tor instances)') return elif not stem.util.system.is_available('tasklist'): - skip(self, '(tasklist unavailable)') + self.skipTest('(tasklist unavailable)') return runner = test.runner.get_runner() @@ -245,21 +243,21 @@ class TestSystem(unittest.TestCase): runner = test.runner.get_runner() if stem.util.system.is_windows(): - skip(self, '(unavailable on windows)') + self.skipTest('(unavailable on windows)') return elif not _has_port(): - skip(self, '(test instance has no port)') + self.skipTest('(test instance has no port)') return elif stem.util.system.is_mac() or stem.util.system.is_gentoo(): - skip(self, '(resolvers unavailable)') + self.skipTest('(resolvers unavailable)') return elif not runner.is_ptraceable(): - skip(self, '(DisableDebuggerAttachment is set)') + self.skipTest('(DisableDebuggerAttachment is set)') return elif not (stem.util.system.is_available('netstat') or stem.util.system.is_available('sockstat') or stem.util.system.is_available('lsof')): - skip(self, '(connection resolvers unavailable)') + self.skipTest('(connection resolvers unavailable)') return tor_pid, tor_port = runner.get_pid(), test.runner.CONTROL_PORT @@ -272,20 +270,21 @@ class TestSystem(unittest.TestCase): """ runner = test.runner.get_runner() + if not _has_port(): - skip(self, '(test instance has no port)') + self.skipTest('(test instance has no port)') return elif not stem.util.system.is_available('netstat'): - skip(self, '(netstat unavailable)') + self.skipTest('(netstat unavailable)') return elif stem.util.system.is_bsd() or stem.util.system.is_windows(): - skip(self, '(linux only)') + self.skipTest('(linux only)') return elif stem.util.system.is_gentoo(): - skip(self, '(unavailable on gentoo)') + self.skipTest('(unavailable on gentoo)') return elif not runner.is_ptraceable(): - skip(self, '(DisableDebuggerAttachment is set)') + self.skipTest('(DisableDebuggerAttachment is set)') return netstat_prefix = stem.util.system.GET_PID_BY_PORT_NETSTAT @@ -304,17 +303,18 @@ class TestSystem(unittest.TestCase): """ runner = test.runner.get_runner() + if not _has_port(): - skip(self, '(test instance has no port)') + self.skipTest('(test instance has no port)') return elif not stem.util.system.is_available('sockstat'): - skip(self, '(sockstat unavailable)') + self.skipTest('(sockstat unavailable)') return elif not stem.util.system.is_bsd(): - skip(self, '(bsd only)') + self.skipTest('(bsd only)') return elif not runner.is_ptraceable(): - skip(self, '(DisableDebuggerAttachment is set)') + self.skipTest('(DisableDebuggerAttachment is set)') return sockstat_prefix = stem.util.system.GET_PID_BY_PORT_SOCKSTAT % '' @@ -333,17 +333,18 @@ class TestSystem(unittest.TestCase): """ runner = test.runner.get_runner() + if not _has_port(): - skip(self, '(test instance has no port)') + self.skipTest('(test instance has no port)') return elif not stem.util.system.is_available('lsof'): - skip(self, '(lsof unavailable)') + self.skipTest('(lsof unavailable)') return elif stem.util.system.is_mac() or stem.util.system.is_gentoo(): - skip(self, '(resolvers unavailable)') + self.skipTest('(resolvers unavailable)') return elif not runner.is_ptraceable(): - skip(self, '(DisableDebuggerAttachment is set)') + self.skipTest('(DisableDebuggerAttachment is set)') return lsof_prefix = stem.util.system.GET_PID_BY_PORT_LSOF @@ -387,10 +388,10 @@ class TestSystem(unittest.TestCase): runner = test.runner.get_runner() if stem.util.system.is_windows(): - skip(self, '(unavailable on windows)') + self.skipTest('(unavailable on windows)') return elif not runner.is_ptraceable(): - skip(self, '(DisableDebuggerAttachment is set)') + self.skipTest('(DisableDebuggerAttachment is set)') return runner_pid, tor_cwd = runner.get_pid(), runner.get_tor_cwd() @@ -405,10 +406,10 @@ class TestSystem(unittest.TestCase): runner = test.runner.get_runner() if not stem.util.system.is_available('pwdx'): - skip(self, '(pwdx unavailable)') + self.skipTest('(pwdx unavailable)') return elif not runner.is_ptraceable(): - skip(self, '(DisableDebuggerAttachment is set)') + self.skipTest('(DisableDebuggerAttachment is set)') return # filter the call function to only allow this command @@ -431,10 +432,10 @@ class TestSystem(unittest.TestCase): runner = test.runner.get_runner() if not stem.util.system.is_available('lsof'): - skip(self, '(lsof unavailable)') + self.skipTest('(lsof unavailable)') return elif not runner.is_ptraceable(): - skip(self, '(DisableDebuggerAttachment is set)') + self.skipTest('(DisableDebuggerAttachment is set)') return # filter the call function to only allow this command @@ -464,7 +465,7 @@ class TestSystem(unittest.TestCase): """ if not stem.util.proc.is_available(): - skip(self, '(proc unavailable)') + self.skipTest('(proc unavailable)') return call_replacement = filter_system_call(['ps ']) @@ -484,7 +485,7 @@ class TestSystem(unittest.TestCase): """ if not stem.util.system.is_available('ps'): - skip(self, '(ps unavailable)') + self.skipTest('(ps unavailable)') return pid = test.runner.get_runner().get_pid() @@ -505,7 +506,7 @@ class TestSystem(unittest.TestCase): """ if not stem.util.proc.is_available(): - skip(self, '(proc unavailable)') + self.skipTest('(proc unavailable)') return call_replacement = filter_system_call(['ps ']) @@ -523,7 +524,7 @@ class TestSystem(unittest.TestCase): """ if not stem.util.system.is_available('ps'): - skip(self, '(ps unavailable)') + self.skipTest('(ps unavailable)') return pid = test.runner.get_runner().get_pid() @@ -553,7 +554,7 @@ class TestSystem(unittest.TestCase): # '/root' if getpass.getuser() == 'root': - skip(self, '(running as root)') + self.skipTest('(running as root)') return self.assertEqual(os.getcwd(), stem.util.system.expand_path('.')) diff --git a/test/integ/version.py b/test/integ/version.py index 06837c7..35e016a 100644 --- a/test/integ/version.py +++ b/test/integ/version.py @@ -9,10 +9,7 @@ import stem.prereq import stem.version import test.runner -from test.util import ( - skip, - require_controller, -) +from test.util import require_controller class TestVersion(unittest.TestCase): @@ -22,7 +19,7 @@ class TestVersion(unittest.TestCase): """ if not stem.util.system.is_available('tor'): - skip(self, "(tor isn't in our path)") + self.skipTest("(tor isn't in our path)") return # Since tor is in our path we should expect to be able to get the version diff --git a/test/unit/descriptor/export.py b/test/unit/descriptor/export.py index ae7e4a0..a262343 100644 --- a/test/unit/descriptor/export.py +++ b/test/unit/descriptor/export.py @@ -12,7 +12,6 @@ except ImportError: import stem.prereq from stem.descriptor.export import export_csv, export_csv_file -from test.util import skip from test.mocking import ( get_relay_server_descriptor, @@ -27,7 +26,7 @@ class TestExport(unittest.TestCase): """ if stem.prereq._is_python_26(): - skip(self, '(header added in python 2.7)') + self.skipTest('(header added in python 2.7)') return desc = get_relay_server_descriptor() @@ -76,7 +75,7 @@ class TestExport(unittest.TestCase): """ if stem.prereq._is_python_26(): - skip(self, '(header added in python 2.7)') + self.skipTest('(header added in python 2.7)') return desc = get_relay_server_descriptor() diff --git a/test/unit/descriptor/reader.py b/test/unit/descriptor/reader.py index ac7fd83..ad6a425 100644 --- a/test/unit/descriptor/reader.py +++ b/test/unit/descriptor/reader.py @@ -17,7 +17,6 @@ import stem.descriptor.reader import test.unit.descriptor from stem.util import str_type, system -from test.util import skip try: # added in python 3.3 @@ -191,7 +190,7 @@ class TestDescriptorReader(unittest.TestCase): # test relies on being unable to read a file if getpass.getuser() == 'root': - skip(self, '(running as root)') + self.skipTest('(running as root)') return # Skip the test on windows, since you can only set the file's @@ -199,7 +198,7 @@ class TestDescriptorReader(unittest.TestCase): # http://docs.python.org/library/os.html#os.chmod if system.is_windows(): - skip(self, '(chmod not functional)') + self.skipTest('(chmod not functional)') test_listing_path = self._make_processed_files_listing(BASIC_LISTING) os.chmod(test_listing_path, 0o077) # remove read permissions @@ -413,7 +412,7 @@ class TestDescriptorReader(unittest.TestCase): # Skip on windows since SIGALRM is unavailable if system.is_windows(): - skip(self, '(SIGALRM unavailable)') + self.skipTest('(SIGALRM unavailable)') is_test_running = True reader = stem.descriptor.reader.DescriptorReader('/usr') @@ -550,10 +549,10 @@ class TestDescriptorReader(unittest.TestCase): # test relies on being unable to read a file if getpass.getuser() == 'root': - skip(self, '(running as root)') + self.skipTest('(running as root)') return elif system.is_windows(): - skip(self, '(chmod not functional)') + self.skipTest('(chmod not functional)') return test_path = os.path.join(self.temp_directory, 'secret_file') diff --git a/test/unit/installation.py b/test/unit/installation.py index 83d560a..73881de 100644 --- a/test/unit/installation.py +++ b/test/unit/installation.py @@ -5,8 +5,6 @@ import unittest import test.util -from test.util import skip - class TestInstallation(unittest.TestCase): # TODO: remove when dropping support for python 2.6 @@ -26,7 +24,7 @@ class TestInstallation(unittest.TestCase): def test_installs_all_modules(self): if self.skip_reason: - skip(self, self.skip_reason) + self.skipTest(self.skip_reason) return True # Modules cited my our setup.py looks like... @@ -50,7 +48,7 @@ class TestInstallation(unittest.TestCase): def test_installs_all_data_files(self): if self.skip_reason: - skip(self, self.skip_reason) + self.skipTest(self.skip_reason) return True # Checking that we have all non-source files. Data looks like... diff --git a/test/unit/manual.py b/test/unit/manual.py index deded2d..6d0c174 100644 --- a/test/unit/manual.py +++ b/test/unit/manual.py @@ -12,8 +12,6 @@ import stem.prereq import stem.manual import stem.util.system -from test.util import skip - try: # account for urllib's change between python 2.x and 3.x import urllib.request as urllib @@ -160,10 +158,10 @@ class TestManual(unittest.TestCase): """ if not stem.util.system.is_available('man'): - skip(self, '(require man command)') + self.skipTest('(require man command)') return elif stem.util.system.is_mac(): - skip(self, '(man lacks --encoding arg on OSX, #18660)') + self.skipTest('(man lacks --encoding arg on OSX, #18660)') return manual = stem.manual.Manual.from_man(EXAMPLE_MAN_PATH) @@ -183,10 +181,10 @@ class TestManual(unittest.TestCase): """ if not stem.util.system.is_available('man'): - skip(self, '(require man command)') + self.skipTest('(require man command)') return elif stem.util.system.is_mac(): - skip(self, '(man lacks --encoding arg on OSX, #18660)') + self.skipTest('(man lacks --encoding arg on OSX, #18660)') return manual = stem.manual.Manual.from_man(UNKNOWN_OPTIONS_MAN_PATH) @@ -213,7 +211,7 @@ class TestManual(unittest.TestCase): """ if not stem.util.system.is_available('man'): - skip(self, '(require man command)') + self.skipTest('(require man command)') return manual = stem.manual.Manual.from_man(EXAMPLE_MAN_PATH) diff --git a/test/unit/tutorial_examples.py b/test/unit/tutorial_examples.py index bf313ce..de5079e 100644 --- a/test/unit/tutorial_examples.py +++ b/test/unit/tutorial_examples.py @@ -21,7 +21,6 @@ from stem.descriptor.remote import DIRECTORY_AUTHORITIES from test import mocking from test.unit import exec_documentation_example -from test.util import skip from test.mocking import ( get_relay_server_descriptor, @@ -247,7 +246,7 @@ class TestTutorialExamples(unittest.TestCase): # example imports OrderedDict from collections which doesn't work under # python 2.6 - skip(self, "(example doesn't support python 2.6)") + self.skipTest("(example doesn't support python 2.6)") return get_authorities_mock().items.return_value = [('moria1', DIRECTORY_AUTHORITIES['moria1']), ('maatuska', DIRECTORY_AUTHORITIES['maatuska'])] diff --git a/test/util.py b/test/util.py index 75ea50e..2468b55 100644 --- a/test/util.py +++ b/test/util.py @@ -18,8 +18,7 @@ Tasks are... :: - Test Skipping - |- skip - skips the current test if we can + Test Requirements |- only_run_once - skip test if it has been ran before |- require - skips the test unless a requirement is met | @@ -220,20 +219,6 @@ def get_new_capabilities(): return NEW_CAPABILITIES -def skip(test_case, message): - """ - Skips the test if we can. The capability for skipping tests was added in - python 2.7 so callers should return after this, so they report 'success' if - this method is unavailable. - - :param unittest.TestCase test_case: test being ran - :param str message: message to skip the test with - """ - - if not stem.prereq._is_python_26(): - test_case.skipTest(message) - - def only_run_once(func): """ Skips the test if it has ran before. If it hasn't then flags it as being ran. @@ -246,7 +231,7 @@ def only_run_once(func): RAN_TESTS.append(self.id()) return func(self, *args, **kwargs) else: - skip(self, '(already ran)') + self.skipTest('(already ran)') return wrapped @@ -261,7 +246,7 @@ def require(condition, message): if condition(): return func(self, *args, **kwargs) else: - skip(self, '(%s)' % message) + self.skipTest('(%s)' % message) return wrapped @@ -281,7 +266,7 @@ def require_controller(func): if test.runner.get_runner().is_accessible(): return func(self, *args, **kwargs) else: - skip(self, '(no connection)') + self.skipTest('(no connection)') return wrapped @@ -306,7 +291,7 @@ def require_online(func): if Target.ONLINE in test.runner.get_runner().attribute_targets: return func(self, *args, **kwargs) else: - skip(self, '(requires online target)') + self.skipTest('(requires online target)') return wrapped

1 0

[stem/master] Use decorators for common test requirements
by atagar＠torproject.org 06 Apr '17

06 Apr '17

commit a59c001ed6e010895a6bf548f9fb6e73024d7071 Merge: 6680c55 0ee3864 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 6 11:37:02 2017 -0700 Use decorators for common test requirements Handful of minor testing changes, most notably replacing skip() calls for common requirements with decorators. stem/util/test_tools.py | 8 + test/integ/connection/authentication.py | 7 +- test/integ/connection/connect.py | 2 +- test/integ/control/base_controller.py | 6 +- test/integ/control/controller.py | 25 +-- test/integ/descriptor/extrainfo_descriptor.py | 8 +- test/integ/descriptor/microdescriptor.py | 8 +- test/integ/descriptor/networkstatus.py | 14 +- test/integ/descriptor/remote.py | 8 +- test/integ/descriptor/server_descriptor.py | 8 +- test/integ/installation.py | 9 +- test/integ/manual.py | 2 +- test/integ/process.py | 14 +- test/integ/response/protocolinfo.py | 5 +- test/integ/socket/control_message.py | 2 +- test/integ/socket/control_socket.py | 5 +- test/integ/util/connection.py | 6 +- test/integ/util/proc.py | 43 ++-- test/integ/util/system.py | 259 +++++++--------------- test/integ/version.py | 21 +- test/runner.py | 138 +----------- test/unit/descriptor/certificate.py | 17 +- test/unit/descriptor/export.py | 5 +- test/unit/descriptor/hidden_service_descriptor.py | 11 +- test/unit/descriptor/reader.py | 11 +- test/unit/installation.py | 5 +- test/unit/manual.py | 23 +- test/unit/tutorial_examples.py | 5 +- test/util.py | 134 ++++++++++- 29 files changed, 347 insertions(+), 462 deletions(-)

1 0

[sandboxed-tor-browser/master] Bug 21244: Update the MAR signing key for 7.0
by yawning＠torproject.org 06 Apr '17

06 Apr '17

commit b32fb3a83a4fcc60cf05c0c41a7b7b67ada704cd Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Thu Apr 6 17:08:25 2017 +0000 Bug 21244: Update the MAR signing key for 7.0 Mirroring the changes upstream, the old secondary key is now the primary, and the new 7.0 series key is now the new secondary. https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-45.6.0e… --- ChangeLog | 1 + data/installer/release_primary.der | Bin 1229 -> 1229 bytes data/installer/release_secondary.der | Bin 1229 -> 1229 bytes 3 files changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 00ad82b..5331f4f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ Changes in version 0.0.4 - UNRELEASED: + * Bug 21244: Update the MAR signing key for 7.0. * Bug 21536: Remove asn's scramblesuit bridge from Tor Browser. * Fix compilation with Go 1.8. * Use Config.Clone() to clone TLS configs when available. diff --git a/data/installer/release_primary.der b/data/installer/release_primary.der index 542fb24..49a7c01 100644 Binary files a/data/installer/release_primary.der and b/data/installer/release_primary.der differ diff --git a/data/installer/release_secondary.der b/data/installer/release_secondary.der index 49a7c01..cce7860 100644 Binary files a/data/installer/release_secondary.der and b/data/installer/release_secondary.der differ

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 06 Apr '17

06 Apr '17

commit dc7a93bfcb8c9939297569ca489a2178f8038db1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 6 16:18:15 2017 +0000 Update translations for tor-browser-manual --- tr/tr.po | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tr/tr.po b/tr/tr.po index 1f95bb4..eb2d6e7 100644 --- a/tr/tr.po +++ b/tr/tr.po @@ -314,6 +314,8 @@ msgid "" "Select “Connect with provided bridges”. Tor Browser currently has six " "pluggable transport options to choose from." msgstr "" +"\"Sağlanan köprülerle bağlan\" ı seçin. Tor Browser şu anda aralarından " +"seçim yapabileceğiniz altı takılabilir nakliye seçeneğine sahiptir." #: circumvention.page:60 msgid "Which transport should I use?" @@ -649,6 +651,8 @@ msgid "" "Tor Browser can also be started from the command line by running the " "following command from inside the Tor Browser directory:" msgstr "" +"Tor Browser, Tor Browser dizininin içinden aşağıdaki komutu çalıştırarak " +"komut satırından başlatılabilir:" #: known-issues.page:66 #, no-wrap @@ -789,12 +793,16 @@ msgid "" "external ref='media/managing-identities/new_identity.png' " "md5='15b01e35fa83185d94b57bf0ccf09d76'" msgstr "" +"external ref='media/managing-identities/new_identity.png' " +"md5='15b01e35fa83185d94b57bf0ccf09d76'" #: managing-identities.page:105 msgid "" "Tor Browser features “New Identity” and “New Tor Circuit for this Site” " "options, located in the Torbutton menu." msgstr "" +"Tor Browser, Torbutton menüsünde bulunan \"Yeni Kimlik\" ve \"Bu Siteye Yeni" +" Tor Devresi\" seçenekleri sunar." #: managing-identities.page:111 msgid "New Identity" @@ -839,6 +847,8 @@ msgid "" "Onion services (formerly known as “hidden services”) are services (like " "websites) that are only accessible through the Tor network." msgstr "" +"Soğan hizmetleri (eskiden \"gizli hizmetler\" olarak bilinir) yalnızca Tor " +"ağı üzerinden erişilebilen hizmetlerdir (web siteleri gibi)." #: onionsites.page:16 msgid "" @@ -1188,6 +1198,9 @@ msgid "" "Increasing the level of the Security Slider will disable or partially " "disable certain browser features to protect against possible attacks." msgstr "" +"Güvenlik Kaydırıcı'nın düzeyini artırmak olası saldırılara karşı koruma " +"sağlamak için belirli tarayıcı özelliklerini tam veya kısmen devre dışı " +"bırakır." #: security-slider.page:42 msgid "High" @@ -1486,6 +1499,8 @@ msgid "" "When you are prompted to update Tor Browser, click on the Torbutton icon, " "then select “Check for Tor Browser Update”." msgstr "" +"Tor Browser'ı güncelleştirmeniz istendiğinde, Torbutton simgesini tıklatın, " +"ardından \"Tor Browser Güncelleme Kontrolü\" nü seçin." #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -1505,6 +1520,8 @@ msgid "" "When Tor Browser has finished checking for updates, click on the “Update” " "button." msgstr "" +"Tor Browser güncellemeleri kontrol etmeyi tamamladığında \"Güncelle\" " +"düğmesine tıklayın." #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -1524,6 +1541,8 @@ msgid "" "Wait for the update to download and install, then restart Tor Browser. You " "will now be running the latest version." msgstr "" +"Güncellemenin indirilmesini ve kurulmasını bekleyin, sonra Tor Browser'ı " +"yeniden başlatın. Şimdi en son sürümü çalıştırıyorsunuz." #: updating.page:58 msgid "Updating Tor Browser manually"

1 0

[depictor/master] Include the bwauth that assigned the bw value for convenience. Also display if the relay is unmeasured
by tom＠torproject.org 06 Apr '17

06 Apr '17

commit 21fe2c9874b484611acbe0e96e227b3aa44da1bb Author: Tom Ritter <tom(a)ritter.vg> Date: Thu Apr 6 11:15:12 2017 -0500 Include the bwauth that assigned the bw value for convenience. Also display if the relay is unmeasured --- website.py | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/website.py b/website.py index c5ca8c4..8c32b66 100755 --- a/website.py +++ b/website.py @@ -1255,6 +1255,29 @@ class WebsiteWriter: self.site.write(" <th>consensus</th>\n </tr>\n") #----------------------------------------------------------------------------------------- + def __find_assigning_bwauth_for_bw_value(self, relay_fp): + """ + Given a relay fingerprint, look at it's bw value and return which bwauth assigned the + value + """ + if relay_fp not in self.consensus.routers: + return "" + + target_bw = self.consensus.routers[relay_fp].bandwidth + + bwauths = [] + bwauths_voted = 0 + for dirauth_nickname in self.votes: + if relay_fp in self.votes[dirauth_nickname].routers: + if self.votes[dirauth_nickname].routers[relay_fp].measured >= 0L: + bwauths_voted += 1 + if target_bw == self.votes[dirauth_nickname].routers[relay_fp].measured: + bwauths.append(dirauth_nickname) + if len(bwauths) == bwauths_voted: + return ["all"] + return bwauths + + #----------------------------------------------------------------------------------------- def _write_relay_info_tableRow(self, relay_fp, relay_nickname): """ Write a single row in the table of relay info. @@ -1337,6 +1360,16 @@ class WebsiteWriter: self.site.write(" <br />" if flagsWritten > 0 else "") self.site.write("bw=" + str(self.consensus.routers[relay_fp].bandwidth)) flagsWritten += 1 + if self.consensus.routers[relay_fp].is_unmeasured: + assigning_bwauths = self.__find_assigning_bwauth_for_bw_value(relay_fp) + self.site.write(" <br />" if flagsWritten > 0 else "") + self.site.write("unmeasured=1") + flagsWritten += 1 + else: + assigning_bwauths = self.__find_assigning_bwauth_for_bw_value(relay_fp) + self.site.write(" <br />" if flagsWritten > 0 else "") + self.site.write("bwauth=" + ",".join(assigning_bwauths)) + flagsWritten += 1 if relay_fp in self.fallback_dirs: self.site.write(" <br />" if flagsWritten > 0 else "")

1 0

[tor/master] Bug 21873: Clarify KeepAliveIsolateSOCKSAuth behavior
by nickm＠torproject.org 06 Apr '17

06 Apr '17

commit 6f0edff399532b816a9fbd27a8fde7acaf01e36c Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Apr 5 17:19:25 2017 -0700 Bug 21873: Clarify KeepAliveIsolateSOCKSAuth behavior --- doc/tor.1.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 568771a..568d037 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1055,7 +1055,8 @@ The following options are useful only for clients (that is, if but never attach a new stream to a circuit that is too old. For hidden services, this applies to the __last__ time a circuit was used, not the first. Circuits with streams constructed with SOCKS authentication via - SocksPorts that have **KeepAliveIsolateSOCKSAuth** ignore this value. + SocksPorts that have **KeepAliveIsolateSOCKSAuth** also remain alive + for MaxCircuitDirtiness seconds after carrying the last such stream. (Default: 10 minutes) [[MaxClientCircuitsPending]] **MaxClientCircuitsPending** __NUM__:: @@ -1117,8 +1118,9 @@ The following options are useful only for clients (that is, if Don't share circuits with streams targeting a different destination address. **KeepAliveIsolateSOCKSAuth**;; - If **IsolateSOCKSAuth** is enabled, keep alive circuits that have - streams with SOCKS authentication set indefinitely. + If **IsolateSOCKSAuth** is enabled, keep alive circuits while they have + at least one stream with SOCKS authentication active. After such a circuit + is idle for more than MaxCircuitDirtiness seconds, it can be closed. **SessionGroup=**__INT__;; If no other isolation rules would prevent it, allow streams on this port to share circuits with streams from every other

1 0

[tor/master] Merge remote-tracking branch 'arthuredelstein/21873'
by nickm＠torproject.org 06 Apr '17

06 Apr '17

commit b47aecbe7647ca85e7c150180440962787910ca4 Merge: 9d34a1e 6f0edff Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 6 11:57:14 2017 -0400 Merge remote-tracking branch 'arthuredelstein/21873' doc/tor.1.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)

1 0

[tor/master] changes file for 21873
by nickm＠torproject.org 06 Apr '17

06 Apr '17

commit 489ef6b38ba66f59bb6562a4702c0500478a7495 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 6 11:57:56 2017 -0400 changes file for 21873 --- changes/21873 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/21873 b/changes/21873 new file mode 100644 index 0000000..24dc824 --- /dev/null +++ b/changes/21873 @@ -0,0 +1,3 @@ + o Documentation: + - Clarify the behavior of the KeepAliveIsolateSOCKSAuth sub-option. + Closes ticket 21873.

1 0

[tor/master] Unit tests for labelled storagedir entries
by nickm＠torproject.org 06 Apr '17

06 Apr '17

commit 5f8860a16f61cd5bbba01fd268071aa8e6b7ba8c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 3 15:58:35 2017 -0400 Unit tests for labelled storagedir entries --- src/test/test_storagedir.c | 105 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/src/test/test_storagedir.c b/src/test/test_storagedir.c index e7e3da6..19e5de4 100644 --- a/src/test/test_storagedir.c +++ b/src/test/test_storagedir.c @@ -256,6 +256,109 @@ test_storagedir_cleaning(void *arg) } } +static void +test_storagedir_save_labeled(void *arg) +{ + (void)arg; + char *dirname = tor_strdup(get_fname_rnd("store_dir")); + storage_dir_t *d = NULL; + uint8_t *inp = tor_malloc_zero(8192); + config_line_t *labels = NULL; + char *fname = NULL; + uint8_t *saved = NULL; + + d = storage_dir_new(dirname, 10); + tt_assert(d); + + crypto_rand((char *)inp, 8192); + + config_line_append(&labels, "Foo", "bar baz"); + config_line_append(&labels, "quux", "quuzXxz"); + const char expected[] = + "Foo bar baz\n" + "quux quuzXxz\n"; + + int r = storage_dir_save_labeled_to_file(d, labels, inp, 8192, &fname); + tt_int_op(r, OP_EQ, 0); + + size_t n; + saved = storage_dir_read(d, fname, 1, &n); + tt_assert(memchr(saved, '\0', n)); + tt_str_op((char*)saved, OP_EQ, expected); /* NUL guarantees strcmp works */ + tt_mem_op(saved+strlen(expected)+1, OP_EQ, inp, 8192); + + done: + storage_dir_free(d); + tor_free(dirname); + tor_free(inp); + tor_free(fname); + config_free_lines(labels); + tor_free(saved); +} + +static void +test_storagedir_read_labeled(void *arg) +{ + (void)arg; + char *dirname = tor_strdup(get_fname_rnd("store_dir")); + storage_dir_t *d = NULL; + uint8_t *inp = tor_malloc_zero(8192); + config_line_t *labels = NULL, *labels2 = NULL; + char *fname = NULL; + tor_mmap_t *map = NULL; + uint8_t *as_read = NULL; + + d = storage_dir_new(dirname, 10); + tt_assert(d); + + tor_snprintf((char*)inp, 8192, + "Hello world\n" + "This is a test\n" + "Yadda yadda.\n"); + size_t bodylen = 8192 - strlen((char*)inp) - 1; + crypto_rand((char *)inp+strlen((char*)inp)+1, bodylen); + + int r = storage_dir_save_bytes_to_file(d, inp, 8192, 1, &fname); + tt_int_op(r, OP_EQ, 0); + + /* Try mapping */ + const uint8_t *datap = NULL; + size_t sz = 0; + map = storage_dir_map_labeled(d, fname, &labels, &datap, &sz); + tt_assert(map); + tt_assert(datap); + tt_u64_op(sz, OP_EQ, bodylen); + tt_mem_op(datap, OP_EQ, inp+strlen((char*)inp)+1, bodylen); + tt_assert(labels); + tt_str_op(labels->key, OP_EQ, "Hello"); + tt_str_op(labels->value, OP_EQ, "world"); + tt_assert(labels->next); + tt_str_op(labels->next->key, OP_EQ, "This"); + tt_str_op(labels->next->value, OP_EQ, "is a test"); + tt_assert(labels->next->next); + tt_str_op(labels->next->next->key, OP_EQ, "Yadda"); + tt_str_op(labels->next->next->value, OP_EQ, "yadda."); + tt_assert(labels->next->next->next == NULL); + + /* Try reading this time. */ + sz = 0; + as_read = storage_dir_read_labeled(d, fname, &labels2, &sz); + tt_assert(as_read); + tt_u64_op(sz, OP_EQ, bodylen); + tt_mem_op(as_read, OP_EQ, inp+strlen((char*)inp)+1, bodylen); + tt_assert(config_lines_eq(labels, labels2)); + + done: + storage_dir_free(d); + tor_free(dirname); + tor_free(inp); + tor_free(fname); + config_free_lines(labels); + config_free_lines(labels2); + tor_munmap_file(map); + tor_free(as_read); +} + #define ENT(name) \ { #name, test_storagedir_ ## name, TT_FORK, NULL, NULL } @@ -265,6 +368,8 @@ struct testcase_t storagedir_tests[] = { ENT(deletion), ENT(full), ENT(cleaning), + ENT(save_labeled), + ENT(read_labeled), END_OF_TESTCASES };

1 0