tor-commits April 2016

tor-commits@lists.torproject.org

20 participants
1645 discussions

[nyx/master] Fix nyx event names in tests
by atagar＠torproject.org 18 Apr '16

18 Apr '16

commit c6a21afa3a6d182e6f16f8860c61a4490b5685ac Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Apr 18 12:52:20 2016 -0700 Fix nyx event names in tests Oops, changed what our warning and error runlevels were but didn't update the tests. --- test/arguments.py | 12 ++++++------ test/log/condense_runlevels.py | 4 ++-- test/popups.py | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/arguments.py b/test/arguments.py index d27281c..76c6d38 100644 --- a/test/arguments.py +++ b/test/arguments.py @@ -68,7 +68,7 @@ class TestArgumentParsing(unittest.TestCase): class TestExpandEvents(unittest.TestCase): def test_examples(self): self.assertEqual(set(['INFO', 'NOTICE', 'UNKNOWN', 'TRANSPORT_LAUNCHED']), expand_events('inUt')) - self.assertEqual(set(['NOTICE', 'WARN', 'ERR', 'NYX_WARN', 'NYX_ERR']), expand_events('N4')) + self.assertEqual(set(['NOTICE', 'WARN', 'ERR', 'NYX_WARNING', 'NYX_ERROR']), expand_events('N4')) self.assertEqual(set(), expand_events('cfX')) def test_runlevel_expansion(self): @@ -78,11 +78,11 @@ class TestExpandEvents(unittest.TestCase): self.assertEqual(set(['WARN', 'ERR']), expand_events('W')) self.assertEqual(set(['ERR']), expand_events('E')) - self.assertEqual(set(['NYX_DEBUG', 'NYX_INFO', 'NYX_NOTICE', 'NYX_WARN', 'NYX_ERR']), expand_events('1')) - self.assertEqual(set(['NYX_INFO', 'NYX_NOTICE', 'NYX_WARN', 'NYX_ERR']), expand_events('2')) - self.assertEqual(set(['NYX_NOTICE', 'NYX_WARN', 'NYX_ERR']), expand_events('3')) - self.assertEqual(set(['NYX_WARN', 'NYX_ERR']), expand_events('4')) - self.assertEqual(set(['NYX_ERR']), expand_events('5')) + self.assertEqual(set(['NYX_DEBUG', 'NYX_INFO', 'NYX_NOTICE', 'NYX_WARNING', 'NYX_ERROR']), expand_events('1')) + self.assertEqual(set(['NYX_INFO', 'NYX_NOTICE', 'NYX_WARNING', 'NYX_ERROR']), expand_events('2')) + self.assertEqual(set(['NYX_NOTICE', 'NYX_WARNING', 'NYX_ERROR']), expand_events('3')) + self.assertEqual(set(['NYX_WARNING', 'NYX_ERROR']), expand_events('4')) + self.assertEqual(set(['NYX_ERROR']), expand_events('5')) def test_short_circuit_options(self): # Check that the 'A' and 'X' options short circuit normal parsing, diff --git a/test/log/condense_runlevels.py b/test/log/condense_runlevels.py index f7c831c..5c06d92 100644 --- a/test/log/condense_runlevels.py +++ b/test/log/condense_runlevels.py @@ -9,5 +9,5 @@ class TestCondenseRunlevels(unittest.TestCase): self.assertEqual(['BW'], condense_runlevels('BW')) self.assertEqual(['DEBUG', 'NOTICE', 'ERR'], condense_runlevels('DEBUG', 'NOTICE', 'ERR')) self.assertEqual(['DEBUG-NOTICE', 'NYX DEBUG-INFO'], condense_runlevels('DEBUG', 'NYX_DEBUG', 'INFO', 'NYX_INFO', 'NOTICE')) - self.assertEqual(['TOR/NYX NOTICE-ERR'], condense_runlevels('NOTICE', 'WARN', 'ERR', 'NYX_NOTICE', 'NYX_WARN', 'NYX_ERR')) - self.assertEqual(['DEBUG', 'TOR/NYX NOTICE-ERR', 'BW'], condense_runlevels('DEBUG', 'NOTICE', 'WARN', 'ERR', 'NYX_NOTICE', 'NYX_WARN', 'NYX_ERR', 'BW')) + self.assertEqual(['TOR/NYX NOTICE-ERR'], condense_runlevels('NOTICE', 'WARN', 'ERR', 'NYX_NOTICE', 'NYX_WARNING', 'NYX_ERROR')) + self.assertEqual(['DEBUG', 'TOR/NYX NOTICE-ERR', 'BW'], condense_runlevels('DEBUG', 'NOTICE', 'WARN', 'ERR', 'NYX_NOTICE', 'NYX_WARNING', 'NYX_ERROR', 'BW')) diff --git a/test/popups.py b/test/popups.py index f38cb45..d782b96 100644 --- a/test/popups.py +++ b/test/popups.py @@ -313,7 +313,7 @@ class TestPopups(unittest.TestCase): def test_select_event_types_with_input(self): rendered = test.render(nyx.popups.select_event_types) self.assertEqual(EXPECTED_EVENT_SELECTOR, rendered.content) - self.assertEqual(set(['NYX_INFO', 'ERR', 'WARN', 'BW', 'NYX_ERR', 'NYX_WARN', 'NYX_NOTICE']), rendered.return_value) + self.assertEqual(set(['NYX_INFO', 'ERR', 'WARN', 'BW', 'NYX_ERROR', 'NYX_WARNING', 'NYX_NOTICE']), rendered.return_value) @require_curses @patch('nyx.popups._top', Mock(return_value = 0))

1 0

[nyx/master] Finish and test header panel
by atagar＠torproject.org 18 Apr '16

18 Apr '16

commit c8b4852149e90786196d35a930ce18226f0587b7 Merge: 60a5765 bcd498a Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Apr 18 13:22:21 2016 -0700 Finish and test header panel On our first pass we left a few todo comments. Finishing these off and adding tests for panel rendering. Not perfect, but good enough as a template for the rest of our panels. nyx/arguments.py | 10 +- nyx/controller.py | 18 +- nyx/curses.py | 66 +++++ nyx/log.py | 14 +- nyx/panel/__init__.py | 200 ++++--------- nyx/panel/connection.py | 47 +--- nyx/panel/graph.py | 2 +- nyx/panel/header.py | 621 +++++++++++++++++++---------------------- nyx/panel/log.py | 58 +--- nyx/panel/torrc.py | 2 +- nyx/settings/attributes.cfg | 4 +- nyx/tracker.py | 5 +- nyxrc.sample | 4 - test/__init__.py | 22 +- test/arguments.py | 12 +- test/log/condense_runlevels.py | 4 +- test/panel/__init__.py | 7 + test/panel/header.py | 349 +++++++++++++++++++++++ test/popups.py | 2 +- 19 files changed, 838 insertions(+), 609 deletions(-)

1 0

[nyx/master] Test overall header panel rendering
by atagar＠torproject.org 18 Apr '16

18 Apr '16

commit bcd498a464172ada4e760de20b6a7caf5d5c44a9 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Apr 18 13:19:38 2016 -0700 Test overall header panel rendering --- nyx/panel/header.py | 2 +- test/__init__.py | 2 +- test/panel/header.py | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 2 deletions(-) diff --git a/nyx/panel/header.py b/nyx/panel/header.py index a9712b4..d470ba1 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -175,7 +175,7 @@ class HeaderPanel(nyx.panel.DaemonPanel): _draw_fingerprint_and_fd_usage(subwindow, 0, 3, left_width, vals) _draw_flags(subwindow, 0, 4, vals.flags) - _draw_status(subwindow, 0, subwindow.height - 1, self.is_paused(), self._message, *self._message_attr) + _draw_status(subwindow, 0, self.get_height() - 1, self.is_paused(), self._message, *self._message_attr) def reset_listener(self, controller, event_type, _): self._update() diff --git a/test/__init__.py b/test/__init__.py index 178b79d..3730254 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -71,7 +71,7 @@ def render(func, *args, **kwargs): func_args = inspect.getargspec(func).args - if func_args and func_args[0] == 'subwindow': + if func_args[:1] == ['subwindow'] or func_args[:2] == ['self', 'subwindow']: def _draw(subwindow): return func(subwindow, *args, **kwargs) diff --git a/test/panel/header.py b/test/panel/header.py index 58f700c..62d54af 100644 --- a/test/panel/header.py +++ b/test/panel/header.py @@ -16,8 +16,70 @@ import test from test import require_curses from mock import patch, Mock +EXPECTED_PANEL = """ +nyx - odin (Linux 3.5.0-54-generic) Tor 0.2.8.1-alpha-dev +Unnamed - 174.21.17.28:7000, Dir Port: 7001, Control Port (cookie): 7002 +cpu: 12.3% tor, 5.7% nyx mem: 11 MB (2.1%) pid: 765 +fingerprint: 1A94D1A794FCB2F8B6CBC179EF8FDD4008A98D3B +flags: Running, Exit + +page 2 / 4 - m: menu, p: pause, h: page help, q: quit +""".strip() + + +def test_sampling(): + return nyx.panel.header.Sampling( + retrieved = 1234.5, + is_connected = True, + connection_time = 2345.6, + last_heartbeat = 3456.7, + + fingerprint = '1A94D1A794FCB2F8B6CBC179EF8FDD4008A98D3B', + nickname = 'Unnamed', + newnym_wait = None, + exit_policy = stem.exit_policy.ExitPolicy('reject *:*'), + flags = ['Running', 'Exit'], + + version = '0.2.8.1-alpha-dev', + version_status = 'unrecommended', + + address = '174.21.17.28', + or_port = '7000', + dir_port = '7001', + control_port = '7002', + socket_path = None, + is_relay = True, + + auth_type = 'cookie', + pid = '765', + start_time = 4567.8, + fd_limit = 100, + fd_used = 40, + + nyx_total_cpu_time = 100, + tor_cpu = '12.3', + nyx_cpu = '5.7', + memory = '11 MB', + memory_percent = '2.1', + + hostname = 'odin', + platform = 'Linux 3.5.0-54-generic', + ) + class TestHeader(unittest.TestCase): + @require_curses + @patch('nyx.controller.get_controller') + @patch('nyx.panel.header.tor_controller') + @patch('nyx.panel.header.Sampling.create') + def test_rendering_panel(self, sampling_mock, tor_controller_mock, nyx_controller_mock): + nyx_controller_mock().get_page.return_value = 1 + nyx_controller_mock().get_page_count.return_value = 4 + sampling_mock.return_value = test_sampling() + + panel = nyx.panel.header.HeaderPanel() + self.assertEqual(EXPECTED_PANEL, test.render(panel.draw).content) + @patch('nyx.panel.header.tor_controller') @patch('nyx.tracker.get_resource_tracker') @patch('time.time', Mock(return_value = 1234.5))

1 0

[nyx/master] Use draw() for header panel
by atagar＠torproject.org 18 Apr '16

18 Apr '16

commit 1154e051ac7bb4f30631a52797b647516471cd35 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 9 14:45:54 2016 -0700 Use draw() for header panel First step in migrating the panels to the new Subwindow pattern. Not quite happy with this yet but it's a good start and works. --- nyx/panel/__init__.py | 7 +++ nyx/panel/header.py | 118 +++++++++++++++++++++++++------------------------- 2 files changed, 66 insertions(+), 59 deletions(-) diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index 9b616e5..028ba73 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -339,6 +339,13 @@ class Panel(object): if not self.visible or HALT_ACTIVITY: return + if self.panel_name in ('header'): + height = self.get_height() if self.get_height() != -1 else None + width = self.get_width() if self.get_width() != -1 else None + + nyx.curses.draw(self.draw, top = self.top, width = width, height = height) + return + # if the panel's completely outside its parent then this is a no-op new_height, new_width = self.get_preferred_size() diff --git a/nyx/panel/header.py b/nyx/panel/header.py index c6627c2..8efbf8e 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -171,48 +171,48 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): nyx.panel.KeyHandler('r', action = _reconnect), ) - def draw(self, width, height): + def draw(self, subwindow): vals = self._vals # local reference to avoid concurrency concerns - self._last_width = width + self._last_width = subwindow.width is_wide = self.is_wide() # space available for content - left_width = max(width / 2, 77) if is_wide else width - right_width = width - left_width + left_width = max(subwindow.width / 2, 77) if is_wide else subwindow.width + right_width = subwindow.width - left_width - self._draw_platform_section(0, 0, left_width, vals) + self._draw_platform_section(subwindow, 0, 0, left_width, vals) if vals.is_connected: - self._draw_ports_section(0, 1, left_width, vals) + self._draw_ports_section(subwindow, 0, 1, left_width, vals) else: - self._draw_disconnected(0, 1, left_width, vals) + self._draw_disconnected(subwindow, 0, 1, left_width, vals) if is_wide: - self._draw_resource_usage(left_width, 0, right_width, vals) + self._draw_resource_usage(subwindow, left_width, 0, right_width, vals) if vals.is_relay: - self._draw_fingerprint_and_fd_usage(left_width, 1, right_width, vals) - self._draw_flags(0, 2, left_width, vals) - self._draw_exit_policy(left_width, 2, right_width, vals) + self._draw_fingerprint_and_fd_usage(subwindow, left_width, 1, right_width, vals) + self._draw_flags(subwindow, 0, 2, left_width, vals) + self._draw_exit_policy(subwindow, left_width, 2, right_width, vals) elif vals.is_connected: - self._draw_newnym_option(left_width, 1, right_width, vals) + self._draw_newnym_option(subwindow, left_width, 1, right_width, vals) else: - self._draw_resource_usage(0, 2, left_width, vals) + self._draw_resource_usage(subwindow, 0, 2, left_width, vals) if vals.is_relay: - self._draw_fingerprint_and_fd_usage(0, 3, left_width, vals) - self._draw_flags(0, 4, left_width, vals) + self._draw_fingerprint_and_fd_usage(subwindow, 0, 3, left_width, vals) + self._draw_flags(subwindow, 0, 4, left_width, vals) if self._message: - self.addstr(height - 1, 0, self._message, *self._message_attr) + subwindow.addstr(0, subwindow.height - 1, self._message, *self._message_attr) elif not self.is_paused(): controller = nyx.controller.get_controller() - self.addstr(height - 1, 0, 'page %i / %i - m: menu, p: pause, h: page help, q: quit' % (controller.get_page() + 1, controller.get_page_count())) + subwindow.addstr(0, subwindow.height - 1, 'page %i / %i - m: menu, p: pause, h: page help, q: quit' % (controller.get_page() + 1, controller.get_page_count())) else: - self.addstr(height - 1, 0, 'Paused', HIGHLIGHT) + subwindow.addstr(0, subwindow.height - 1, 'Paused', HIGHLIGHT) - def _draw_platform_section(self, x, y, width, vals): + def _draw_platform_section(self, subwindow, x, y, width, vals): """ Section providing the user's hostname, platform, and version information... @@ -222,26 +222,26 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): initial_x, space_left = x, min(width, 40) - x = self.addstr(y, x, vals.format('nyx - {hostname}', space_left)) + x = subwindow.addstr(x, y, vals.format('nyx - {hostname}', space_left)) space_left -= x - initial_x if space_left >= 10: - self.addstr(y, x, ' (%s)' % vals.format('{platform}', space_left - 3)) + subwindow.addstr(x, y, ' (%s)' % vals.format('{platform}', space_left - 3)) x, space_left = initial_x + 43, width - 43 if vals.version != 'Unknown' and space_left >= 10: - x = self.addstr(y, x, vals.format('Tor {version}', space_left)) + x = subwindow.addstr(x, y, vals.format('Tor {version}', space_left)) space_left -= x - 43 - initial_x if space_left >= 7 + len(vals.version_status): version_color = CONFIG['attr.version_status_colors'].get(vals.version_status, WHITE) - x = self.addstr(y, x, ' (') - x = self.addstr(y, x, vals.version_status, version_color) - self.addstr(y, x, ')') + x = subwindow.addstr(x, y, ' (') + x = subwindow.addstr(x, y, vals.version_status, version_color) + subwindow.addstr(x, y, ')') - def _draw_ports_section(self, x, y, width, vals): + def _draw_ports_section(self, subwindow, x, y, width, vals): """ Section providing our nickname, address, and port information... @@ -249,37 +249,37 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): """ if not vals.is_relay: - x = self.addstr(y, x, 'Relaying Disabled', CYAN) + x = subwindow.addstr(x, y, 'Relaying Disabled', CYAN) else: - x = self.addstr(y, x, vals.format('{nickname} - {address}:{or_port}')) + x = subwindow.addstr(x, y, vals.format('{nickname} - {address}:{or_port}')) if vals.dir_port != '0': - x = self.addstr(y, x, vals.format(', Dir Port: {dir_port}')) + x = subwindow.addstr(x, y, vals.format(', Dir Port: {dir_port}')) if vals.control_port: if width >= x + 19 + len(vals.control_port) + len(vals.auth_type): auth_color = RED if vals.auth_type == 'open' else GREEN - x = self.addstr(y, x, ', Control Port (') - x = self.addstr(y, x, vals.auth_type, auth_color) - self.addstr(y, x, vals.format('): {control_port}')) + x = subwindow.addstr(x, y, ', Control Port (') + x = subwindow.addstr(x, y, vals.auth_type, auth_color) + subwindow.addstr(x, y, vals.format('): {control_port}')) else: - self.addstr(y, x, vals.format(', Control Port: {control_port}')) + subwindow.addstr(x, y, vals.format(', Control Port: {control_port}')) elif vals.socket_path: - self.addstr(y, x, vals.format(', Control Socket: {socket_path}')) + subwindow.addstr(x, y, vals.format(', Control Socket: {socket_path}')) - def _draw_disconnected(self, x, y, width, vals): + def _draw_disconnected(self, subwindow, x, y, width, vals): """ Message indicating that tor is disconnected... Tor Disconnected (15:21 07/13/2014, press r to reconnect) """ - x = self.addstr(y, x, 'Tor Disconnected', RED, BOLD) + x = subwindow.addstr(x, y, 'Tor Disconnected', RED, BOLD) last_heartbeat = time.strftime('%H:%M %m/%d/%Y', time.localtime(vals.last_heartbeat)) - self.addstr(y, x, ' (%s, press r to reconnect)' % last_heartbeat) + subwindow.addstr(x, y, ' (%s, press r to reconnect)' % last_heartbeat) - def _draw_resource_usage(self, x, y, width, vals): + def _draw_resource_usage(self, subwindow, x, y, width, vals): """ System resource usage of the tor process... @@ -307,11 +307,11 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): for (start, label) in sys_fields: if width >= start + len(label): - self.addstr(y, x + start, label) + subwindow.addstr(x + start, y, label) else: break - def _draw_fingerprint_and_fd_usage(self, x, y, width, vals): + def _draw_fingerprint_and_fd_usage(self, subwindow, x, y, width, vals): """ Presents our fingerprint, and our file descriptor usage if we're running out... @@ -321,7 +321,7 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): initial_x, space_left = x, width - x = self.addstr(y, x, vals.format('fingerprint: {fingerprint}', width)) + x = subwindow.addstr(x, y, vals.format('fingerprint: {fingerprint}', width)) space_left -= x - initial_x if space_left >= 30 and vals.fd_used and vals.fd_limit != -1: @@ -337,38 +337,38 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): else: percentage_format = () - x = self.addstr(y, x, ', file descriptors' if space_left >= 37 else ', file desc') - x = self.addstr(y, x, vals.format(': {fd_used} / {fd_limit} (')) - x = self.addstr(y, x, '%i%%' % fd_percent, *percentage_format) - self.addstr(y, x, ')') + x = subwindow.addstr(x, y, ', file descriptors' if space_left >= 37 else ', file desc') + x = subwindow.addstr(x, y, vals.format(': {fd_used} / {fd_limit} (')) + x = subwindow.addstr(x, y, '%i%%' % fd_percent, *percentage_format) + subwindow.addstr(x, y, ')') - def _draw_flags(self, x, y, width, vals): + def _draw_flags(self, subwindow, x, y, width, vals): """ Presents flags held by our relay... flags: Running, Valid """ - x = self.addstr(y, x, 'flags: ') + x = subwindow.addstr(x, y, 'flags: ') if vals.flags: for i, flag in enumerate(vals.flags): flag_color = CONFIG['attr.flag_colors'].get(flag, WHITE) - x = self.addstr(y, x, flag, flag_color, BOLD) + x = subwindow.addstr(x, y, flag, flag_color, BOLD) if i < len(vals.flags) - 1: - x = self.addstr(y, x, ', ') + x = subwindow.addstr(x, y, ', ') else: - self.addstr(y, x, 'none', CYAN, BOLD) + subwindow.addstr(x, y, 'none', CYAN, BOLD) - def _draw_exit_policy(self, x, y, width, vals): + def _draw_exit_policy(self, subwindow, x, y, width, vals): """ Presents our exit policy... exit policy: reject *:* """ - x = self.addstr(y, x, 'exit policy: ') + x = subwindow.addstr(x, y, 'exit policy: ') if not vals.exit_policy: return @@ -377,28 +377,28 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): for i, rule in enumerate(rules): policy_color = GREEN if rule.is_accept else RED - x = self.addstr(y, x, str(rule), policy_color, BOLD) + x = subwindow.addstr(x, y, str(rule), policy_color, BOLD) if i < len(rules) - 1: - x = self.addstr(y, x, ', ') + x = subwindow.addstr(x, y, ', ') if vals.exit_policy.has_default(): if rules: - x = self.addstr(y, x, ', ') + x = subwindow.addstr(x, y, ', ') - self.addstr(y, x, '<default>', CYAN, BOLD) + subwindow.addstr(x, y, '<default>', CYAN, BOLD) - def _draw_newnym_option(self, x, y, width, vals): + 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: - self.addstr(y, x, "press 'n' for a new identity") + subwindow.addstr(x, y, "press 'n' for a new identity") else: plural = 's' if vals.newnym_wait > 1 else '' - self.addstr(y, x, 'building circuits, available again in %i second%s' % (vals.newnym_wait, plural)) + subwindow.addstr(x, y, 'building circuits, available again in %i second%s' % (vals.newnym_wait, plural)) def run(self): """

1 0

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

18 Apr '16

commit 619cb2186fe67414c4ce1e49e7eb07821bdf24c8 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 9 21:48:37 2016 -0700 Test _draw_platform_section() First test for our header panel. This requires our render() method to provide a draw context but other than that straight forward. I'm not a fan of the new _sampling() function. I'll change that when we add tests for get_sampling(). --- nyx/panel/header.py | 91 ++++++++++++++++++++++++++------------------------ test/__init__.py | 17 ++++++++-- test/panel/__init__.py | 7 ++++ test/panel/header.py | 47 ++++++++++++++++++++++++++ 4 files changed, 116 insertions(+), 46 deletions(-) diff --git a/nyx/panel/header.py b/nyx/panel/header.py index 8efbf8e..f49efe1 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -45,7 +45,7 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): threading.Thread.__init__(self) self.setDaemon(True) - self._vals = get_sampling() + self._vals = _get_sampling() self._last_width = 100 self._pause_condition = threading.Condition() @@ -181,7 +181,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 - self._draw_platform_section(subwindow, 0, 0, left_width, vals) + _draw_platform_section(subwindow, 0, 0, left_width, vals) if vals.is_connected: self._draw_ports_section(subwindow, 0, 1, left_width, vals) @@ -212,35 +212,6 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): else: subwindow.addstr(0, subwindow.height - 1, 'Paused', HIGHLIGHT) - def _draw_platform_section(self, subwindow, x, y, width, vals): - """ - Section providing the user's hostname, platform, and version information... - - nyx - odin (Linux 3.5.0-52-generic) Tor 0.2.5.1-alpha-dev (unrecommended) - |------ platform (40 characters) ------| |----------- tor version -----------| - """ - - initial_x, space_left = x, min(width, 40) - - x = subwindow.addstr(x, y, vals.format('nyx - {hostname}', space_left)) - space_left -= x - initial_x - - if space_left >= 10: - subwindow.addstr(x, y, ' (%s)' % vals.format('{platform}', space_left - 3)) - - x, space_left = initial_x + 43, width - 43 - - if vals.version != 'Unknown' and space_left >= 10: - x = subwindow.addstr(x, y, vals.format('Tor {version}', space_left)) - space_left -= x - 43 - initial_x - - if space_left >= 7 + len(vals.version_status): - version_color = CONFIG['attr.version_status_colors'].get(vals.version_status, WHITE) - - x = subwindow.addstr(x, y, ' (') - x = subwindow.addstr(x, y, vals.version_status, version_color) - subwindow.addstr(x, y, ')') - def _draw_ports_section(self, subwindow, x, y, width, vals): """ Section providing our nickname, address, and port information... @@ -435,7 +406,7 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): def _update(self): previous_height = self.get_height() - self._vals = get_sampling(self._vals) + self._vals = _get_sampling(self._vals) if self._vals.fd_used and self._vals.fd_limit != -1: fd_percent = 100 * self._vals.fd_used / self._vals.fd_limit @@ -466,7 +437,24 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): self.redraw(True) # just need to redraw ourselves -def get_sampling(last_sampling = None): +def _sampling(**attr): + class Sampling(collections.namedtuple('Sampling', attr.keys())): + def __init__(self, **attr): + super(Sampling, self).__init__(**attr) + self._attr = attr + + def format(self, message, crop_width = None): + formatted_msg = message.format(**self._attr) + + if crop_width: + 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() @@ -538,17 +526,34 @@ def get_sampling(last_sampling = None): 'platform': '%s %s' % (os.uname()[0], os.uname()[2]), # [platform name] [version] } - class Sampling(collections.namedtuple('Sampling', attr.keys())): - def __init__(self, **attr): - super(Sampling, self).__init__(**attr) - self._attr = attr + return _sampling(**attr) - def format(self, message, crop_width = None): - formatted_msg = message.format(**self._attr) - if crop_width: - formatted_msg = str_tools.crop(formatted_msg, crop_width) +def _draw_platform_section(subwindow, x, y, width, vals): + """ + Section providing the user's hostname, platform, and version information... - return formatted_msg + nyx - odin (Linux 3.5.0-52-generic) Tor 0.2.5.1-alpha-dev (unrecommended) + |------ platform (40 characters) ------| |----------- tor version -----------| + """ - return Sampling(**attr) + initial_x, space_left = x, min(width, 40) + + x = subwindow.addstr(x, y, vals.format('nyx - {hostname}', space_left)) + space_left -= x - initial_x + + if space_left >= 10: + subwindow.addstr(x, y, ' (%s)' % vals.format('{platform}', space_left - 3)) + + x, space_left = initial_x + 43, width - 43 + + if vals.version != 'Unknown' and space_left >= 10: + x = subwindow.addstr(x, y, vals.format('Tor {version}', space_left)) + space_left -= x - 43 - initial_x + + if space_left >= 7 + len(vals.version_status): + version_color = CONFIG['attr.version_status_colors'].get(vals.version_status, WHITE) + + x = subwindow.addstr(x, y, ' (') + x = subwindow.addstr(x, y, vals.version_status, version_color) + subwindow.addstr(x, y, ')') diff --git a/test/__init__.py b/test/__init__.py index b606b4a..23dda15 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -3,6 +3,7 @@ Unit tests for nyx. """ import collections +import inspect import time import unittest @@ -55,7 +56,8 @@ def require_curses(func): def render(func, *args, **kwargs): """ Runs the given curses function, providing content that's rendered on the - screen. + screen. If the function starts with an argument named 'subwindow' then it's + provided one through :func:`~nyx.curses.draw`. :param function func: draw function to be invoked @@ -67,9 +69,18 @@ def render(func, *args, **kwargs): def draw_func(): nyx.curses.disable_acs() nyx.curses.CURSES_SCREEN.erase() - start_time = time.time() - attr['return_value'] = func(*args, **kwargs) + + func_args = inspect.getargspec(func).args + + if func_args and func_args[0] == 'subwindow': + def _draw(subwindow): + return func(subwindow, *args, **kwargs) + + attr['return_value'] = nyx.curses.draw(_draw) + else: + attr['return_value'] = func(*args, **kwargs) + attr['runtime'] = time.time() - start_time attr['content'] = nyx.curses.screenshot() diff --git a/test/panel/__init__.py b/test/panel/__init__.py new file mode 100644 index 0000000..0050223 --- /dev/null +++ b/test/panel/__init__.py @@ -0,0 +1,7 @@ +""" +Unit tests for nyx's panel modules. +""" + +__all__ = [ + 'header', +] diff --git a/test/panel/header.py b/test/panel/header.py new file mode 100644 index 0000000..ee18eb6 --- /dev/null +++ b/test/panel/header.py @@ -0,0 +1,47 @@ +""" +Unit tests for nyx.panel.header. +""" + +import unittest + +import nyx.panel.header +import test + +from test import require_curses + + +class TestHeader(unittest.TestCase): + @require_curses + def test_draw_platform_section(self): + vals = nyx.panel.header._sampling( + hostname = 'odin', + platform = 'Linux 3.5.0-54-generic', + version = '0.2.8.1-alpha-dev', + version_status = 'unrecommended', + ) + + test_input = { + 80: 'nyx - odin (Linux 3.5.0-54-generic) Tor 0.2.8.1-alpha-dev', + 70: 'nyx - odin (Linux 3.5.0-54-generic) Tor 0.2.8.1-alpha-dev', + 60: 'nyx - odin (Linux 3.5.0-54-generic) Tor 0.2.8.1-al...', + 50: 'nyx - odin (Linux 3.5.0-54-generic)', + 40: 'nyx - odin (Linux 3.5.0-54-generic)', + 30: 'nyx - odin (Linux 3.5.0-54...)', + 20: 'nyx - odin (Linu...)', + 10: 'nyx - odin', + 0: 'nyx - odin', + } + + for width, expected in test_input.items(): + self.assertEqual(expected, test.render(nyx.panel.header._draw_platform_section, 0, 0, width, vals).content) + + @require_curses + def test_draw_platform_section_without_version(self): + vals = nyx.panel.header._sampling( + hostname = 'odin', + platform = 'Linux 3.5.0-54-generic', + version = 'Unknown', + ) + + rendered = test.render(nyx.panel.header._draw_platform_section, 0, 0, 80, vals) + self.assertEqual('nyx - odin (Linux 3.5.0-54-generic)', rendered.content)

1 0

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

18 Apr '16

commit 6159e01fdc1473fd25f3633b154a74cdac20ef8d Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 9 22:32:39 2016 -0700 Test _draw_ports_section() --- nyx/panel/header.py | 56 ++++++++++++++++++++++++++-------------------------- test/panel/header.py | 31 +++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 28 deletions(-) diff --git a/nyx/panel/header.py b/nyx/panel/header.py index f49efe1..54046b2 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -184,7 +184,7 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): _draw_platform_section(subwindow, 0, 0, left_width, vals) if vals.is_connected: - self._draw_ports_section(subwindow, 0, 1, left_width, vals) + _draw_ports_section(subwindow, 0, 1, left_width, vals) else: self._draw_disconnected(subwindow, 0, 1, left_width, vals) @@ -212,33 +212,6 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): else: subwindow.addstr(0, subwindow.height - 1, 'Paused', HIGHLIGHT) - def _draw_ports_section(self, subwindow, x, y, width, vals): - """ - Section providing our nickname, address, and port information... - - Unnamed - 0.0.0.0:7000, Control Port (cookie): 9051 - """ - - if not vals.is_relay: - x = subwindow.addstr(x, y, 'Relaying Disabled', CYAN) - else: - x = subwindow.addstr(x, y, vals.format('{nickname} - {address}:{or_port}')) - - if vals.dir_port != '0': - x = subwindow.addstr(x, y, vals.format(', Dir Port: {dir_port}')) - - if vals.control_port: - if width >= x + 19 + len(vals.control_port) + len(vals.auth_type): - auth_color = RED if vals.auth_type == 'open' else GREEN - - x = subwindow.addstr(x, y, ', Control Port (') - x = subwindow.addstr(x, y, vals.auth_type, auth_color) - subwindow.addstr(x, y, vals.format('): {control_port}')) - else: - subwindow.addstr(x, y, vals.format(', Control Port: {control_port}')) - elif vals.socket_path: - subwindow.addstr(x, y, vals.format(', Control Socket: {socket_path}')) - def _draw_disconnected(self, subwindow, x, y, width, vals): """ Message indicating that tor is disconnected... @@ -557,3 +530,30 @@ def _draw_platform_section(subwindow, x, y, width, vals): x = subwindow.addstr(x, y, ' (') x = subwindow.addstr(x, y, vals.version_status, version_color) subwindow.addstr(x, y, ')') + +def _draw_ports_section(subwindow, x, y, width, vals): + """ + Section providing our nickname, address, and port information... + + Unnamed - 0.0.0.0:7000, Control Port (cookie): 9051 + """ + + if not vals.is_relay: + x = subwindow.addstr(x, y, 'Relaying Disabled', CYAN) + else: + x = subwindow.addstr(x, y, vals.format('{nickname} - {address}:{or_port}')) + + if vals.dir_port != '0': + x = subwindow.addstr(x, y, vals.format(', Dir Port: {dir_port}')) + + if vals.control_port: + if width >= x + 19 + len(vals.control_port) + len(vals.auth_type): + auth_color = RED if vals.auth_type == 'open' else GREEN + + x = subwindow.addstr(x, y, ', Control Port (') + x = subwindow.addstr(x, y, vals.auth_type, auth_color) + subwindow.addstr(x, y, vals.format('): {control_port}')) + else: + subwindow.addstr(x, y, vals.format(', Control Port: {control_port}')) + elif vals.socket_path: + subwindow.addstr(x, y, vals.format(', Control Socket: {socket_path}')) diff --git a/test/panel/header.py b/test/panel/header.py index ee18eb6..c06fd39 100644 --- a/test/panel/header.py +++ b/test/panel/header.py @@ -45,3 +45,34 @@ class TestHeader(unittest.TestCase): rendered = test.render(nyx.panel.header._draw_platform_section, 0, 0, 80, vals) self.assertEqual('nyx - odin (Linux 3.5.0-54-generic)', rendered.content) + + @require_curses + def test_draw_ports_section(self): + vals = nyx.panel.header._sampling( + nickname = 'Unnamed', + address = '174.21.17.28', + or_port = '7000', + dir_port = '7001', + control_port = '9051', + auth_type = 'cookie', + is_relay = True, + ) + + test_input = { + 80: 'Unnamed - 174.21.17.28:7000, Dir Port: 7001, Control Port (cookie): 9051', + 50: 'Unnamed - 174.21.17.28:7000, Dir Port: 7001, Control Port: 9051', + 0: 'Unnamed - 174.21.17.28:7000, Dir Port: 7001, Control Port: 9051', + } + + for width, expected in test_input.items(): + self.assertEqual(expected, test.render(nyx.panel.header._draw_ports_section, 0, 0, width, vals).content) + + @require_curses + def test_draw_ports_section_with_relaying(self): + vals = nyx.panel.header._sampling( + control_port = None, + socket_path = '/path/to/control/socket', + is_relay = False, + ) + + self.assertEqual('Relaying Disabled, Control Socket: /path/to/control/socket', test.render(nyx.panel.header._draw_ports_section, 0, 0, 80, vals).content)

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 18 Apr '16

18 Apr '16

commit 164c75bf12c16affa8b97e75dc6651a7a1c9d9e8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 18 10:15:03 2016 +0000 Update translations for bridgedb --- lt/LC_MESSAGES/bridgedb.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lt/LC_MESSAGES/bridgedb.po b/lt/LC_MESSAGES/bridgedb.po index 8b91eab..e48b792 100644 --- a/lt/LC_MESSAGES/bridgedb.po +++ b/lt/LC_MESSAGES/bridgedb.po @@ -3,7 +3,8 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: -# AG <aiste.gvildyte(a)gmail.com>, 2016 +# Aiste G <aiste.gvildyte(a)gmail.com>, 2016 +# Aiste G <aiste.gvildyte(a)gmail.com>, 2016 # Moo, 2015 # Saule Papeckyte <saule.papeckyte(a)gmail.com>, 2015 # Edgaras7 <system(a)vippsystems.com>, 2014 @@ -13,8 +14,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: AG <aiste.gvildyte(a)gmail.com>\n" +"PO-Revision-Date: 2016-04-18 10:05+0000\n" +"Last-Translator: Aiste G <aiste.gvildyte(a)gmail.com>\n" "Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -48,7 +49,7 @@ msgstr "Šaltinio Kodas" #: bridgedb/https/templates/base.html:85 msgid "Changelog" -msgstr "" +msgstr "Keitimų žurnalas" #: bridgedb/https/templates/base.html:88 msgid "Contact"

1 0

[translation/tor_animation_completed] Update translations for tor_animation_completed
by translation＠torproject.org 18 Apr '16

18 Apr '16

commit c2f93884f0d490898547a4d530bd528091641c79 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 18 08:46:27 2016 +0000 Update translations for tor_animation_completed --- zh_HK.srt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_HK.srt b/zh_HK.srt index e1753c1..0695a83 100644 --- a/zh_HK.srt +++ b/zh_HK.srt @@ -149,5 +149,5 @@ Tor洋蔥路由就更強 35 00:02:02,000 --> 00:02:07,000 下載同埋用Tor洋蔥路由，或者 -營運一個轉向點啦！ +營運一個轉向站啦！

1 0

[translation/tor_animation] Update translations for tor_animation
by translation＠torproject.org 18 Apr '16

18 Apr '16

commit e30f5fc73a473dae0b58c78969a797614a3cb97e Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 18 08:46:24 2016 +0000 Update translations for tor_animation --- zh_HK.srt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_HK.srt b/zh_HK.srt index e1753c1..0695a83 100644 --- a/zh_HK.srt +++ b/zh_HK.srt @@ -149,5 +149,5 @@ Tor洋蔥路由就更強 35 00:02:02,000 --> 00:02:07,000 下載同埋用Tor洋蔥路由，或者 -營運一個轉向點啦！ +營運一個轉向站啦！

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 18 Apr '16

18 Apr '16

commit 49a0c53354727575ee66c91cddb7a7a74df12919 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 18 08:46:12 2016 +0000 Update translations for torbutton-torbuttonproperties --- zh_HK/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_HK/torbutton.properties b/zh_HK/torbutton.properties index bef0787..731bd8a 100644 --- a/zh_HK/torbutton.properties +++ b/zh_HK/torbutton.properties @@ -4,7 +4,7 @@ torbutton.circuit_display.internet = 互聯網 torbutton.circuit_display.ip_unknown = 未知嘅IP torbutton.circuit_display.onion_site = 洋蔥網 torbutton.circuit_display.this_browser = 此瀏覽器 -torbutton.circuit_display.relay = 轉向點 +torbutton.circuit_display.relay = 轉向站 torbutton.circuit_display.tor_bridge = 橋接器 torbutton.circuit_display.unknown_country = 不明國家 torbutton.content_sizer.margin_tooltip = Tor洋蔥路由瀏覽器特意將視窗邊框嘅闊度同高度重新設定，以使你嘅瀏覽器狀態資訊睇嚟更為普通，如此可減少你嘅網絡活動被識別並追蹤嘅可能性。

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2016