tor-commits April 2016

tor-commits@lists.torproject.org

20 participants
1645 discussions

[nyx/master] Class for Sampling rather than namedtuple
by atagar＠torproject.org 18 Apr '16

18 Apr '16

commit da39c3fedd7e7345d4e587ba2fe571369c6d9add Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Apr 10 13:12:16 2016 -0700 Class for Sampling rather than namedtuple As mentioned earlier I didn't like the sampling() and get_sampling() split we needed for our tests. On reflection this is actually nicer if we simply don't strive to make this a namedtuple. --- nyx/panel/header.py | 166 +++++++++++++++++++++++++-------------------------- test/panel/header.py | 14 ++--- 2 files changed, 89 insertions(+), 91 deletions(-) diff --git a/nyx/panel/header.py b/nyx/panel/header.py index 9288db9..01922ec 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -7,7 +7,6 @@ This expands the information it presents to two columns if there's room available. """ -import collections import os import time import threading @@ -45,7 +44,7 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): threading.Thread.__init__(self) self.setDaemon(True) - self._vals = _get_sampling() + self._vals = Sampling.create() self._last_width = 100 self._pause_condition = threading.Condition() @@ -248,7 +247,7 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): def _update(self): previous_height = self.get_height() - self._vals = _get_sampling(self._vals) + self._vals = Sampling.create(self._vals) if self._vals.fd_used and self._vals.fd_limit != -1: fd_percent = 100 * self._vals.fd_used / self._vals.fd_limit @@ -279,96 +278,95 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): self.redraw(True) # just need to redraw ourselves -def _sampling(**attr): - class Sampling(collections.namedtuple('Sampling', attr.keys())): - def __init__(self, **attr): - super(Sampling, self).__init__(**attr) - self._attr = attr +class Sampling(object): + def __init__(self, **attr): + self._attr = attr - def format(self, message, crop_width = None): - formatted_msg = message.format(**self._attr) + for key, value in attr.items(): + setattr(self, key, value) - if crop_width is not None: - formatted_msg = str_tools.crop(formatted_msg, crop_width) - - return formatted_msg - - return Sampling(**attr) - - -def _get_sampling(last_sampling = None): - controller = tor_controller() - retrieved = time.time() + @staticmethod + def create(last_sampling = None): + controller = tor_controller() + retrieved = time.time() - pid = controller.get_pid('') - tor_resources = nyx.tracker.get_resource_tracker().get_value() - nyx_total_cpu_time = sum(os.times()[:3]) + pid = controller.get_pid('') + tor_resources = nyx.tracker.get_resource_tracker().get_value() + nyx_total_cpu_time = sum(os.times()[:3]) - or_listeners = controller.get_listeners(Listener.OR, []) - control_listeners = controller.get_listeners(Listener.CONTROL, []) + or_listeners = controller.get_listeners(Listener.OR, []) + control_listeners = controller.get_listeners(Listener.CONTROL, []) - if controller.get_conf('HashedControlPassword', None): - auth_type = 'password' - elif controller.get_conf('CookieAuthentication', None) == '1': - auth_type = 'cookie' - else: - auth_type = 'open' + if controller.get_conf('HashedControlPassword', None): + auth_type = 'password' + elif controller.get_conf('CookieAuthentication', None) == '1': + auth_type = 'cookie' + else: + auth_type = 'open' - try: - fd_used = proc.file_descriptors_used(pid) - except IOError: - fd_used = None + try: + fd_used = proc.file_descriptors_used(pid) + except IOError: + fd_used = None - if last_sampling: - nyx_cpu_delta = nyx_total_cpu_time - last_sampling.nyx_total_cpu_time - nyx_time_delta = retrieved - last_sampling.retrieved + if last_sampling: + nyx_cpu_delta = nyx_total_cpu_time - last_sampling.nyx_total_cpu_time + nyx_time_delta = retrieved - last_sampling.retrieved - python_cpu_time = nyx_cpu_delta / nyx_time_delta - sys_call_cpu_time = 0.0 # TODO: add a wrapper around call() to get this + python_cpu_time = nyx_cpu_delta / nyx_time_delta + sys_call_cpu_time = 0.0 # TODO: add a wrapper around call() to get this - nyx_cpu = python_cpu_time + sys_call_cpu_time - else: - nyx_cpu = 0.0 - - attr = { - 'retrieved': retrieved, - 'is_connected': controller.is_alive(), - 'connection_time': controller.connection_time(), - 'last_heartbeat': controller.get_latest_heartbeat(), - - 'fingerprint': controller.get_info('fingerprint', 'Unknown'), - 'nickname': controller.get_conf('Nickname', ''), - 'newnym_wait': controller.get_newnym_wait(), - 'exit_policy': controller.get_exit_policy(None), - 'flags': getattr(controller.get_network_status(default = None), 'flags', []), - - 'version': str(controller.get_version('Unknown')).split()[0], - 'version_status': controller.get_info('status/version/current', 'Unknown'), - - 'address': or_listeners[0][0] if (or_listeners and or_listeners[0][0] != '0.0.0.0') else controller.get_info('address', 'Unknown'), - 'or_port': or_listeners[0][1] if or_listeners else '', - 'dir_port': controller.get_conf('DirPort', '0'), - 'control_port': str(control_listeners[0][1]) if control_listeners else None, - 'socket_path': controller.get_conf('ControlSocket', None), - 'is_relay': bool(or_listeners), - - 'auth_type': auth_type, - 'pid': pid, - 'start_time': system.start_time(pid), - 'fd_limit': int(controller.get_info('process/descriptor-limit', '-1')), - 'fd_used': fd_used, - - 'nyx_total_cpu_time': nyx_total_cpu_time, - 'tor_cpu': '%0.1f' % (100 * tor_resources.cpu_sample), - 'nyx_cpu': '%0.1f' % (nyx_cpu), - 'memory': str_tools.size_label(tor_resources.memory_bytes) if tor_resources.memory_bytes > 0 else 0, - 'memory_percent': '%0.1f' % (100 * tor_resources.memory_percent), - - 'hostname': os.uname()[1], - 'platform': '%s %s' % (os.uname()[0], os.uname()[2]), # [platform name] [version] - } - - return _sampling(**attr) + nyx_cpu = python_cpu_time + sys_call_cpu_time + else: + nyx_cpu = 0.0 + + attr = { + 'retrieved': retrieved, + 'is_connected': controller.is_alive(), + 'connection_time': controller.connection_time(), + 'last_heartbeat': controller.get_latest_heartbeat(), + + 'fingerprint': controller.get_info('fingerprint', 'Unknown'), + 'nickname': controller.get_conf('Nickname', ''), + 'newnym_wait': controller.get_newnym_wait(), + 'exit_policy': controller.get_exit_policy(None), + 'flags': getattr(controller.get_network_status(default = None), 'flags', []), + + 'version': str(controller.get_version('Unknown')).split()[0], + 'version_status': controller.get_info('status/version/current', 'Unknown'), + + 'address': or_listeners[0][0] if (or_listeners and or_listeners[0][0] != '0.0.0.0') else controller.get_info('address', 'Unknown'), + 'or_port': or_listeners[0][1] if or_listeners else '', + 'dir_port': controller.get_conf('DirPort', '0'), + 'control_port': str(control_listeners[0][1]) if control_listeners else None, + 'socket_path': controller.get_conf('ControlSocket', None), + 'is_relay': bool(or_listeners), + + 'auth_type': auth_type, + 'pid': pid, + 'start_time': system.start_time(pid), + 'fd_limit': int(controller.get_info('process/descriptor-limit', '-1')), + 'fd_used': fd_used, + + 'nyx_total_cpu_time': nyx_total_cpu_time, + 'tor_cpu': '%0.1f' % (100 * tor_resources.cpu_sample), + 'nyx_cpu': '%0.1f' % (nyx_cpu), + 'memory': str_tools.size_label(tor_resources.memory_bytes) if tor_resources.memory_bytes > 0 else 0, + 'memory_percent': '%0.1f' % (100 * tor_resources.memory_percent), + + 'hostname': os.uname()[1], + 'platform': '%s %s' % (os.uname()[0], os.uname()[2]), # [platform name] [version] + } + + return Sampling(**attr) + + def format(self, message, crop_width = None): + formatted_msg = message.format(**self._attr) + + if crop_width is not None: + formatted_msg = str_tools.crop(formatted_msg, crop_width) + + return formatted_msg def _draw_platform_section(subwindow, x, y, width, vals): diff --git a/test/panel/header.py b/test/panel/header.py index 209ce8b..57222b0 100644 --- a/test/panel/header.py +++ b/test/panel/header.py @@ -16,7 +16,7 @@ from mock import patch class TestHeader(unittest.TestCase): @require_curses def test_draw_platform_section(self): - vals = nyx.panel.header._sampling( + vals = nyx.panel.header.Sampling( hostname = 'odin', platform = 'Linux 3.5.0-54-generic', version = '0.2.8.1-alpha-dev', @@ -40,7 +40,7 @@ class TestHeader(unittest.TestCase): @require_curses def test_draw_platform_section_without_version(self): - vals = nyx.panel.header._sampling( + vals = nyx.panel.header.Sampling( hostname = 'odin', platform = 'Linux 3.5.0-54-generic', version = 'Unknown', @@ -51,7 +51,7 @@ class TestHeader(unittest.TestCase): @require_curses def test_draw_ports_section(self): - vals = nyx.panel.header._sampling( + vals = nyx.panel.header.Sampling( nickname = 'Unnamed', address = '174.21.17.28', or_port = '7000', @@ -72,7 +72,7 @@ class TestHeader(unittest.TestCase): @require_curses def test_draw_ports_section_with_relaying(self): - vals = nyx.panel.header._sampling( + vals = nyx.panel.header.Sampling( control_port = None, socket_path = '/path/to/control/socket', is_relay = False, @@ -88,7 +88,7 @@ class TestHeader(unittest.TestCase): @require_curses def test_draw_resource_usage(self): - vals = nyx.panel.header._sampling( + vals = nyx.panel.header.Sampling( start_time = 1460166022.231895, connection_time = 1460267022.231895, is_connected = False, @@ -116,7 +116,7 @@ class TestHeader(unittest.TestCase): @require_curses def test_draw_fingerprint_and_fd_usage(self): - vals = nyx.panel.header._sampling( + vals = nyx.panel.header.Sampling( fingerprint = '1A94D1A794FCB2F8B6CBC179EF8FDD4008A98D3B', fd_used = None, ) @@ -150,7 +150,7 @@ class TestHeader(unittest.TestCase): } for fd_used, expected in test_input.items(): - vals = nyx.panel.header._sampling( + vals = nyx.panel.header.Sampling( fingerprint = '<stub>', fd_used = fd_used, fd_limit = 100,

1 0

[nyx/master] Drop SHOW_RENDERED_CONTENT
by atagar＠torproject.org 18 Apr '16

18 Apr '16

commit e328b539f54e5864182255f6e556ae3b84e7e97e Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Apr 11 09:03:05 2016 -0700 Drop SHOW_RENDERED_CONTENT Dropping a global that allowed us to pause the curses screens we render, allowing us to see what our tests generated. This was fine once upon a time but we now render too many things for it to be useful. --- test/__init__.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/test/__init__.py b/test/__init__.py index 23dda15..178b79d 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -20,8 +20,6 @@ __all__ = [ 'tracker', ] -SHOW_RENDERED_CONTENT = None # if set, tests render content this many seconds - OUR_SCREEN_SIZE = None TEST_SCREEN_SIZE = nyx.curses.Dimensions(80, 25) @@ -84,9 +82,6 @@ def render(func, *args, **kwargs): attr['runtime'] = time.time() - start_time attr['content'] = nyx.curses.screenshot() - if SHOW_RENDERED_CONTENT: - time.sleep(SHOW_RENDERED_CONTENT) - with patch('nyx.curses.key_input', return_value = nyx.curses.KeyInput(27)): nyx.curses.start(draw_func, transparent_background = True, cursor = False)

1 0

[nyx/master] Test _draw_resource_usage()
by atagar＠torproject.org 18 Apr '16

18 Apr '16

commit 3e3443b3f995dc44a7c3886d5d5c2a8da11f5a7f Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 9 23:47:10 2016 -0700 Test _draw_resource_usage() --- nyx/panel/header.py | 70 +++++++++++++++++++++++++++------------------------- test/panel/header.py | 28 +++++++++++++++++++++ 2 files changed, 64 insertions(+), 34 deletions(-) diff --git a/nyx/panel/header.py b/nyx/panel/header.py index 922b907..9e8e57d 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -180,6 +180,7 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): left_width = max(subwindow.width / 2, 77) if is_wide else subwindow.width right_width = subwindow.width - left_width + pause_time = self.get_pause_time() if self.is_paused() else None _draw_platform_section(subwindow, 0, 0, left_width, vals) @@ -189,7 +190,7 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): _draw_disconnected(subwindow, 0, 1, vals.last_heartbeat) if is_wide: - self._draw_resource_usage(subwindow, left_width, 0, right_width, vals) + _draw_resource_usage(subwindow, left_width, 0, right_width, vals, pause_time) if vals.is_relay: self._draw_fingerprint_and_fd_usage(subwindow, left_width, 1, right_width, vals) @@ -198,7 +199,7 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): elif vals.is_connected: self._draw_newnym_option(subwindow, left_width, 1, right_width, vals) else: - self._draw_resource_usage(subwindow, 0, 2, left_width, vals) + _draw_resource_usage(subwindow, 0, 2, left_width, vals, pause_time) if vals.is_relay: self._draw_fingerprint_and_fd_usage(subwindow, 0, 3, left_width, vals) @@ -212,38 +213,6 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): else: subwindow.addstr(0, subwindow.height - 1, 'Paused', HIGHLIGHT) - def _draw_resource_usage(self, subwindow, x, y, width, vals): - """ - System resource usage of the tor process... - - cpu: 0.0% tor, 1.0% nyx mem: 0 (0.0%) pid: 16329 uptime: 12-20:42:07 - """ - - if vals.start_time: - if not vals.is_connected: - now = vals.connection_time - elif self.is_paused(): - now = self.get_pause_time() - else: - now = time.time() - - uptime = str_tools.short_time_label(now - vals.start_time) - else: - uptime = '' - - sys_fields = ( - (0, vals.format('cpu: {tor_cpu}% tor, {nyx_cpu}% nyx')), - (27, vals.format('mem: {memory} ({memory_percent}%)')), - (47, vals.format('pid: {pid}')), - (59, 'uptime: %s' % uptime), - ) - - for (start, label) in sys_fields: - if width >= start + len(label): - subwindow.addstr(x + start, y, label) - else: - break - def _draw_fingerprint_and_fd_usage(self, subwindow, x, y, width, vals): """ Presents our fingerprint, and our file descriptor usage if we're running @@ -559,3 +528,36 @@ def _draw_disconnected(subwindow, x, y, last_heartbeat): x = subwindow.addstr(x, y, 'Tor Disconnected', RED, BOLD) last_heartbeat_str = time.strftime('%H:%M %m/%d/%Y', time.localtime(last_heartbeat)) subwindow.addstr(x, y, ' (%s, press r to reconnect)' % last_heartbeat_str) + + +def _draw_resource_usage(subwindow, x, y, width, vals, pause_time): + """ + System resource usage of the tor process... + + cpu: 0.0% tor, 1.0% nyx mem: 0 (0.0%) pid: 16329 uptime: 12-20:42:07 + """ + + if vals.start_time: + if not vals.is_connected: + now = vals.connection_time + elif pause_time: + now = pause_time + else: + now = time.time() + + uptime = str_tools.short_time_label(now - vals.start_time) + else: + uptime = '' + + sys_fields = ( + (0, vals.format('cpu: {tor_cpu}% tor, {nyx_cpu}% nyx')), + (27, vals.format('mem: {memory} ({memory_percent}%)')), + (47, vals.format('pid: {pid}')), + (59, 'uptime: %s' % uptime), + ) + + for (start, label) in sys_fields: + if width >= start + len(label): + subwindow.addstr(x + start, y, label) + else: + break diff --git a/test/panel/header.py b/test/panel/header.py index 603d213..3828804 100644 --- a/test/panel/header.py +++ b/test/panel/header.py @@ -84,3 +84,31 @@ class TestHeader(unittest.TestCase): def test_draw_disconnected(self, localtime_mock): localtime_mock.return_value = time.strptime('22:43 04/09/2016', '%H:%M %m/%d/%Y') self.assertEqual('Tor Disconnected (22:43 04/09/2016, press r to reconnect)', test.render(nyx.panel.header._draw_disconnected, 0, 0, 1460267022.231895).content) + + @require_curses + def test_draw_resource_usage(self): + vals = nyx.panel.header._sampling( + start_time = 1460166022.231895, + connection_time = 1460267022.231895, + is_connected = False, + tor_cpu = '2.1', + nyx_cpu = '5.4', + memory = '118 MB', + memory_percent = '3.0', + pid = '22439', + ) + + test_input = { + 80: 'cpu: 2.1% tor, 5.4% nyx mem: 118 MB (3.0%) pid: 22439 uptime: 1-04:03:20', + 70: 'cpu: 2.1% tor, 5.4% nyx mem: 118 MB (3.0%) pid: 22439', + 60: 'cpu: 2.1% tor, 5.4% nyx mem: 118 MB (3.0%) pid: 22439', + 50: 'cpu: 2.1% tor, 5.4% nyx mem: 118 MB (3.0%)', + 40: 'cpu: 2.1% tor, 5.4% nyx', + 30: 'cpu: 2.1% tor, 5.4% nyx', + 20: '', + 10: '', + 0: '', + } + + for width, expected in test_input.items(): + self.assertEqual(expected, test.render(nyx.panel.header._draw_resource_usage, 0, 0, width, vals, None).content)

1 0

[nyx/master] Tracker could raise an unexpected CallError
by atagar＠torproject.org 18 Apr '16

18 Apr '16

commit 8bcc61c84460c31b8e56493bbf1eb306fd5839bc Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Apr 11 09:07:27 2016 -0700 Tracker could raise an unexpected CallError Oops, stem's call() method raises a CallError (OSError subclass), not an IOError. Got the stacktrace while trying to get reconnection to work... File "/usr/lib/python2.7/threading.py", line 551, in __bootstrap_inner self.run() File "/home/atagar/Desktop/nyx/nyx/tracker.py", line 389, in run is_successful = self._task(self._process_pid, self._process_name) File "/home/atagar/Desktop/nyx/nyx/tracker.py", line 656, in _task total_cpu_time, uptime, memory_in_bytes, memory_in_percent = resolver(process_pid) File "/home/atagar/Desktop/nyx/nyx/tracker.py", line 213, in _resources_via_ps ps_call = system.call('ps -p {pid} -o cputime,etime,rss,%mem'.format(pid = pid)) File "/home/atagar/Desktop/nyx/stem/util/system.py", line 1080, in call raise CallError(str(exc), ' '.join(command_list), exit_status, runtime, stdout, stderr) CallError: ps -p 22439 -o cputime,etime,rss,%mem returned exit status 1 --- nyx/tracker.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nyx/tracker.py b/nyx/tracker.py index 6376584..7d567a9 100644 --- a/nyx/tracker.py +++ b/nyx/tracker.py @@ -210,7 +210,10 @@ def _resources_via_ps(pid): # TIME ELAPSED RSS %MEM # 0:04.40 37:57 18772 0.9 - ps_call = system.call('ps -p {pid} -o cputime,etime,rss,%mem'.format(pid = pid)) + try: + ps_call = system.call('ps -p {pid} -o cputime,etime,rss,%mem'.format(pid = pid)) + except OSError as exc: + raise IOError(exc) if ps_call and len(ps_call) >= 2: stats = ps_call[1].strip().split()

1 0

[nyx/master] Test _draw_newnym_option()
by atagar＠torproject.org 18 Apr '16

18 Apr '16

commit 385b4f1a958665a3bd0da2176c0b64ff571fbc52 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Apr 10 13:04:41 2016 -0700 Test _draw_newnym_option() --- nyx/panel/header.py | 27 ++++++++++++++------------- test/panel/header.py | 6 ++++++ 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/nyx/panel/header.py b/nyx/panel/header.py index 96b8383..9288db9 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -197,7 +197,7 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): _draw_flags(subwindow, 0, 2, vals.flags) _draw_exit_policy(subwindow, left_width, 2, vals.exit_policy) elif vals.is_connected: - self._draw_newnym_option(subwindow, left_width, 1, right_width, vals) + _draw_newnym_option(subwindow, left_width, 1, vals.newnym_wait) else: _draw_resource_usage(subwindow, 0, 2, left_width, vals, pause_time) @@ -213,18 +213,6 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): else: subwindow.addstr(0, subwindow.height - 1, 'Paused', HIGHLIGHT) - def _draw_newnym_option(self, subwindow, x, y, width, vals): - """ - Provide a notice for requiesting a new identity, and time until it's next - available if in the process of building circuits. - """ - - if vals.newnym_wait == 0: - subwindow.addstr(x, y, "press 'n' for a new identity") - else: - plural = 's' if vals.newnym_wait > 1 else '' - subwindow.addstr(x, y, 'building circuits, available again in %i second%s' % (vals.newnym_wait, plural)) - def run(self): """ Keeps stats updated, checking for new information at a set rate. @@ -564,3 +552,16 @@ def _draw_exit_policy(subwindow, x, y, exit_policy): x = subwindow.addstr(x, y, ', ') subwindow.addstr(x, y, '<default>', CYAN, BOLD) + + +def _draw_newnym_option(subwindow, x, y, newnym_wait): + """ + Provide a notice for requiesting a new identity, and time until it's next + available if in the process of building circuits. + """ + + if newnym_wait == 0: + subwindow.addstr(x, y, "press 'n' for a new identity") + else: + plural = 's' if newnym_wait > 1 else '' + subwindow.addstr(x, y, 'building circuits, available again in %i second%s' % (newnym_wait, plural)) diff --git a/test/panel/header.py b/test/panel/header.py index 9794644..209ce8b 100644 --- a/test/panel/header.py +++ b/test/panel/header.py @@ -168,3 +168,9 @@ class TestHeader(unittest.TestCase): def test_draw_exit_policy(self): self.assertEqual('exit policy: reject *:*', test.render(nyx.panel.header._draw_exit_policy, 0, 0, stem.exit_policy.ExitPolicy('reject *:*')).content) self.assertEqual('exit policy: accept *:80, accept *:443, reject *:*', test.render(nyx.panel.header._draw_exit_policy, 0, 0, stem.exit_policy.ExitPolicy('accept *:80', 'accept *:443', 'reject *:*')).content) + + @require_curses + def test_draw_newnym_option(self): + self.assertEqual("press 'n' for a new identity", test.render(nyx.panel.header._draw_newnym_option, 0, 0, 0).content) + self.assertEqual('building circuits, available again in 1 second', test.render(nyx.panel.header._draw_newnym_option, 0, 0, 1).content) + self.assertEqual('building circuits, available again in 5 seconds', test.render(nyx.panel.header._draw_newnym_option, 0, 0, 5).content)

1 0

[nyx/master] Test Sampling
by atagar＠torproject.org 18 Apr '16

18 Apr '16

commit c4b69ad5051d51b11ba5b6f2c931e1d604afd903 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Apr 10 16:44:03 2016 -0700 Test Sampling --- test/panel/header.py | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 100 insertions(+), 1 deletion(-) diff --git a/test/panel/header.py b/test/panel/header.py index 57222b0..7ea2510 100644 --- a/test/panel/header.py +++ b/test/panel/header.py @@ -6,14 +6,112 @@ import time import unittest import nyx.panel.header +import stem.control import stem.exit_policy +import stem.version import test from test import require_curses -from mock import patch +from mock import patch, Mock class TestHeader(unittest.TestCase): + @patch('nyx.panel.header.tor_controller') + @patch('nyx.tracker.get_resource_tracker') + @patch('time.time', Mock(return_value = 1234.5)) + @patch('os.times', Mock(return_value = (0.08, 0.03, 0.0, 0.0, 18759021.31))) + @patch('os.uname', Mock(return_value = ('Linux', 'odin', '3.5.0-54-generic', '#81~precise1-Ubuntu SMP Tue Jul 15 04:05:58 UTC 2014', 'i686'))) + @patch('nyx.panel.header.system.start_time', Mock(return_value = 5678)) + @patch('nyx.panel.header.proc.file_descriptors_used', Mock(return_value = 89)) + def test_sample(self, resource_tracker_mock, tor_controller_mock): + tor_controller_mock().is_alive.return_value = True + tor_controller_mock().connection_time.return_value = 567.8 + tor_controller_mock().get_latest_heartbeat.return_value = 89.0 + tor_controller_mock().get_newnym_wait.return_value = 0 + tor_controller_mock().get_exit_policy.return_value = stem.exit_policy.ExitPolicy('reject *:*') + tor_controller_mock().get_network_status.return_value = None + tor_controller_mock().get_version.return_value = stem.version.Version('0.1.2.3-tag') + tor_controller_mock().get_pid.return_value = '123' + + tor_controller_mock().get_info.side_effect = lambda param, default = None: { + 'fingerprint': '1A94D1A794FCB2F8B6CBC179EF8FDD4008A98D3B', + 'status/version/current': 'recommended', + 'address': '174.21.17.28', + 'process/descriptor-limit': 678, + }[param] + + tor_controller_mock().get_conf.side_effect = lambda param, default = None: { + 'Nickname': 'Unnamed', + 'HashedControlPassword': None, + 'CookieAuthentication': '1', + 'DirPort': '7001', + 'ControlSocket': None, + }[param] + + tor_controller_mock().get_listeners.side_effect = lambda param, default = None: { + stem.control.Listener.OR: [('0.0.0.0', 7000)], + stem.control.Listener.CONTROL: [('0.0.0.0', 9051)], + }[param] + + resources = Mock() + resources.cpu_sample = 6.7 + resources.memory_bytes = 62464 + resources.memory_percent = .125 + + resource_tracker_mock().get_value.return_value = resources + + vals = nyx.panel.header.Sampling.create() + + self.assertEqual(1234.5, vals.retrieved) + self.assertEqual(True, vals.is_connected) + self.assertEqual(567.8, vals.connection_time) + self.assertEqual(89.0, vals.last_heartbeat) + self.assertEqual('1A94D1A794FCB2F8B6CBC179EF8FDD4008A98D3B', vals.fingerprint) + self.assertEqual('Unnamed', vals.nickname) + self.assertEqual(0, vals.newnym_wait) + self.assertEqual(stem.exit_policy.ExitPolicy('reject *:*'), vals.exit_policy) + self.assertEqual([], vals.flags) + self.assertEqual('0.1.2.3-tag', vals.version) + self.assertEqual('recommended', vals.version_status) + self.assertEqual('174.21.17.28', vals.address) + self.assertEqual(7000, vals.or_port) + self.assertEqual('7001', vals.dir_port) + self.assertEqual('9051', vals.control_port) + self.assertEqual(None, vals.socket_path) + self.assertEqual(True, vals.is_relay) + self.assertEqual('cookie', vals.auth_type) + self.assertEqual('123', vals.pid) + self.assertEqual(5678, vals.start_time) + self.assertEqual(678, vals.fd_limit) + self.assertEqual(89, vals.fd_used) + self.assertEqual(0.11, vals.nyx_total_cpu_time) + self.assertEqual('670.0', vals.tor_cpu) + self.assertEqual('0.0', vals.nyx_cpu) + self.assertEqual('61 KB', vals.memory) + self.assertEqual('12.5', vals.memory_percent) + self.assertEqual('odin', vals.hostname) + self.assertEqual('Linux 3.5.0-54-generic', vals.platform) + + def test_sample_format(self): + vals = nyx.panel.header.Sampling( + version = '0.2.8.1', + version_status = 'unrecommended', + ) + + self.assertEqual('0.2.8.1 is unrecommended', vals.format('{version} is {version_status}')) + + test_input = { + 25: '0.2.8.1 is unrecommended', + 20: '0.2.8.1 is unreco...', + 15: '0.2.8.1 is...', + 10: '0.2.8.1...', + 5: '', + 0: '', + } + + for width, expected in test_input.items(): + self.assertEqual(expected, vals.format('{version} is {version_status}', width)) + @require_curses def test_draw_platform_section(self): vals = nyx.panel.header.Sampling( @@ -166,6 +264,7 @@ class TestHeader(unittest.TestCase): @require_curses def test_draw_exit_policy(self): + self.assertEqual('exit policy:', test.render(nyx.panel.header._draw_exit_policy, 0, 0, None).content) self.assertEqual('exit policy: reject *:*', test.render(nyx.panel.header._draw_exit_policy, 0, 0, stem.exit_policy.ExitPolicy('reject *:*')).content) self.assertEqual('exit policy: accept *:80, accept *:443, reject *:*', test.render(nyx.panel.header._draw_exit_policy, 0, 0, stem.exit_policy.ExitPolicy('accept *:80', 'accept *:443', 'reject *:*')).content)

1 0

[nyx/master] Move SYSTEM_CALL_TIME to Stem
by atagar＠torproject.org 18 Apr '16

18 Apr '16

commit 1c3fc574c3a2303189306bdc74c32add20423a03 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 16 12:09:25 2016 -0700 Move SYSTEM_CALL_TIME to Stem On reflection SYSTEM_CALL_TIME better belongs in Stem itself. No need any longer for this wrapper. --- nyx/panel/header.py | 24 +----------------------- test/panel/header.py | 5 ----- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/nyx/panel/header.py b/nyx/panel/header.py index f29d232..4e4f922 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -31,13 +31,6 @@ MIN_DUAL_COL_WIDTH = 141 # minimum width where we'll show two columns SHOW_FD_THRESHOLD = 60 # show file descriptor usage if usage is over this percentage UPDATE_RATE = 5 # rate in seconds at which we refresh -# Tracks total time spent shelling out to other commands like 'ps' and -# 'netstat', so we can account for it as part of our cpu time. - -SYSTEM_CALL_TIME = 0.0 -SYSTEM_CALL_TIME_LOCK = threading.RLock() -SYSTEM_CALL_ORIG = stem.util.system.call - CONFIG = conf.config_dict('nyx', { 'attr.flag_colors': {}, 'attr.version_status_colors': {}, @@ -45,21 +38,6 @@ CONFIG = conf.config_dict('nyx', { }) -def call_wrapper(*args, **kwargs): - global SYSTEM_CALL_TIME - - start_time = time.time() - - try: - return SYSTEM_CALL_ORIG(*args, **kwargs) - finally: - with SYSTEM_CALL_TIME_LOCK: - SYSTEM_CALL_TIME += time.time() - start_time - - -stem.util.system.call = call_wrapper - - class HeaderPanel(nyx.panel.Panel, threading.Thread): """ Top area containing tor settings and system information. @@ -307,7 +285,7 @@ class Sampling(object): pid = controller.get_pid('') tor_resources = nyx.tracker.get_resource_tracker().get_value() - nyx_total_cpu_time = sum(os.times()[:3], SYSTEM_CALL_TIME) + nyx_total_cpu_time = sum(os.times()[:3], stem.util.system.SYSTEM_CALL_TIME) or_listeners = controller.get_listeners(stem.control.Listener.OR, []) control_listeners = controller.get_listeners(stem.control.Listener.CONTROL, []) diff --git a/test/panel/header.py b/test/panel/header.py index 6e0f275..e601f00 100644 --- a/test/panel/header.py +++ b/test/panel/header.py @@ -18,11 +18,6 @@ from mock import patch, Mock class TestHeader(unittest.TestCase): - def test_system_call_time_tracked(self): - initial = nyx.panel.header.SYSTEM_CALL_TIME - stem.util.system.call('sleep 0.5') - self.assertTrue(nyx.panel.header.SYSTEM_CALL_TIME - initial > 0.4) - @patch('nyx.panel.header.tor_controller') @patch('nyx.tracker.get_resource_tracker') @patch('time.time', Mock(return_value = 1234.5))

1 0

[nyx/master] Change keybinding for resizing graph to 'g'
by atagar＠torproject.org 18 Apr '16

18 Apr '16

commit 03e02165fa723a1a619ac46788c4ef2f17967682 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Apr 11 09:15:26 2016 -0700 Change keybinding for resizing graph to 'g' The 'r' keybinding conflicted with reconnecting to tor. --- nyx/panel/graph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index 401c079..48cf3b9 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -522,7 +522,7 @@ class GraphPanel(nyx.panel.Panel): self.redraw(True) return ( - nyx.panel.KeyHandler('r', 'resize graph', self.resize_graph), + nyx.panel.KeyHandler('g', 'resize graph', self.resize_graph), nyx.panel.KeyHandler('s', 'graphed stats', _pick_stats, self.displayed_stat if self.displayed_stat else 'none'), nyx.panel.KeyHandler('b', 'graph bounds', _next_bounds, self.bounds_type.replace('_', ' ')), nyx.panel.KeyHandler('i', 'graph update interval', _pick_interval, self.update_interval),

1 0

[nyx/master] Test _draw_exit_policy()
by atagar＠torproject.org 18 Apr '16

18 Apr '16

commit 09c23a7433d4710c8c88962c7b4acc3f21dcc5d0 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Apr 10 13:00:53 2016 -0700 Test _draw_exit_policy() --- nyx/panel/header.py | 57 ++++++++++++++++++++++++++-------------------------- test/panel/header.py | 6 ++++++ 2 files changed, 35 insertions(+), 28 deletions(-) diff --git a/nyx/panel/header.py b/nyx/panel/header.py index 00d4794..96b8383 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -195,7 +195,7 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): if vals.is_relay: _draw_fingerprint_and_fd_usage(subwindow, left_width, 1, right_width, vals) _draw_flags(subwindow, 0, 2, vals.flags) - self._draw_exit_policy(subwindow, left_width, 2, right_width, vals) + _draw_exit_policy(subwindow, left_width, 2, vals.exit_policy) elif vals.is_connected: self._draw_newnym_option(subwindow, left_width, 1, right_width, vals) else: @@ -213,33 +213,6 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): else: subwindow.addstr(0, subwindow.height - 1, 'Paused', HIGHLIGHT) - def _draw_exit_policy(self, subwindow, x, y, width, vals): - """ - Presents our exit policy... - - exit policy: reject *:* - """ - - x = subwindow.addstr(x, y, 'exit policy: ') - - if not vals.exit_policy: - return - - rules = list(vals.exit_policy.strip_private().strip_default()) - - for i, rule in enumerate(rules): - policy_color = GREEN if rule.is_accept else RED - x = subwindow.addstr(x, y, str(rule), policy_color, BOLD) - - if i < len(rules) - 1: - x = subwindow.addstr(x, y, ', ') - - if vals.exit_policy.has_default(): - if rules: - x = subwindow.addstr(x, y, ', ') - - subwindow.addstr(x, y, '<default>', CYAN, BOLD) - def _draw_newnym_option(self, subwindow, x, y, width, vals): """ Provide a notice for requiesting a new identity, and time until it's next @@ -563,3 +536,31 @@ def _draw_flags(subwindow, x, y, flags): x = subwindow.addstr(x, y, ', ') else: subwindow.addstr(x, y, 'none', CYAN, BOLD) + + +def _draw_exit_policy(subwindow, x, y, exit_policy): + """ + Presents our exit policy... + + exit policy: reject *:* + """ + + x = subwindow.addstr(x, y, 'exit policy: ') + + if not exit_policy: + return + + rules = list(exit_policy.strip_private().strip_default()) + + for i, rule in enumerate(rules): + policy_color = GREEN if rule.is_accept else RED + x = subwindow.addstr(x, y, str(rule), policy_color, BOLD) + + if i < len(rules) - 1: + x = subwindow.addstr(x, y, ', ') + + if exit_policy.has_default(): + if rules: + x = subwindow.addstr(x, y, ', ') + + subwindow.addstr(x, y, '<default>', CYAN, BOLD) diff --git a/test/panel/header.py b/test/panel/header.py index 39982e0..9794644 100644 --- a/test/panel/header.py +++ b/test/panel/header.py @@ -6,6 +6,7 @@ import time import unittest import nyx.panel.header +import stem.exit_policy import test from test import require_curses @@ -162,3 +163,8 @@ class TestHeader(unittest.TestCase): self.assertEqual('flags: none', test.render(nyx.panel.header._draw_flags, 0, 0, []).content) self.assertEqual('flags: Guard', test.render(nyx.panel.header._draw_flags, 0, 0, ['Guard']).content) self.assertEqual('flags: Running, Exit', test.render(nyx.panel.header._draw_flags, 0, 0, ['Running', 'Exit']).content) + + @require_curses + def test_draw_exit_policy(self): + self.assertEqual('exit policy: reject *:*', test.render(nyx.panel.header._draw_exit_policy, 0, 0, stem.exit_policy.ExitPolicy('reject *:*')).content) + self.assertEqual('exit policy: accept *:80, accept *:443, reject *:*', test.render(nyx.panel.header._draw_exit_policy, 0, 0, stem.exit_policy.ExitPolicy('accept *:80', 'accept *:443', 'reject *:*')).content)

1 0

[nyx/master] Move input_prompt() to controller
by atagar＠torproject.org 18 Apr '16

18 Apr '16

commit 2d2e0c4435dda692c97a895ece690cf6b11f04db Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Apr 18 12:02:07 2016 -0700 Move input_prompt() to controller The controller already proxies this, so might as well move the implementation over too. It's tiny. Also dropping a duplicate redraw() call. --- nyx/controller.py | 18 +++++++++++++++++- nyx/panel/header.py | 20 +------------------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/nyx/controller.py b/nyx/controller.py index 3336837..1957770 100644 --- a/nyx/controller.py +++ b/nyx/controller.py @@ -66,7 +66,23 @@ def show_message(message = None, *attr, **kwargs): def input_prompt(msg, initial_value = ''): - return get_controller().header_panel().input_prompt(msg, initial_value) + """ + Prompts the user for input. + + :param str message: prompt for user input + :param str initial_value: initial value of the prompt + + :returns: **str** with the user input, this is **None** if the prompt is + canceled + """ + + header_panel = get_controller().header_panel() + + header_panel.show_message(msg) + user_input = nyx.curses.str_input(len(msg), header_panel.get_height() - 1, initial_value) + header_panel.show_message() + + return user_input class Controller(object): diff --git a/nyx/panel/header.py b/nyx/panel/header.py index 897ffbc..a9712b4 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -77,24 +77,6 @@ class HeaderPanel(nyx.panel.DaemonPanel): self.show_message() # clear override return user_input - def input_prompt(self, message, initial_value = ''): - """ - Prompts the user for input. - - :param str message: prompt for user input - :param str initial_value: initial value of the prompt - - :returns: **str** with the user input, this is **None** if the prompt is - canceled - """ - - self.show_message(message) - self.redraw(True) - user_input = nyx.curses.str_input(len(message), self.get_height() - 1, initial_value) - self.show_message() - - return user_input - def is_wide(self): """ True if we should show two columns of information, False otherwise. @@ -143,7 +125,7 @@ class HeaderPanel(nyx.panel.DaemonPanel): try: controller.reconnect(chroot_path = CONFIG['tor.chroot']) except stem.connection.MissingPassword: - password = self.input_prompt('Controller Password: ') + password = nyx.controller.input_prompt('Controller Password: ') if password: controller.authenticate(password)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2016