July 2016 - tor-commits - lists.torproject.org

[trunnel/master] Unit test to detect error fixed in 72da63f338088138
by nickm＠torproject.org 11 Jul '16

11 Jul '16

commit 4a969e74adb1b818b5b4293241300c2bffe8fd57 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 11 16:35:44 2016 -0400 Unit test to detect error fixed in 72da63f338088138 --- test/c/test_vararray.c | 1 + 1 file changed, 1 insertion(+) diff --git a/test/c/test_vararray.c b/test/c/test_vararray.c index 7c65795..f99ed43 100644 --- a/test/c/test_vararray.c +++ b/test/c/test_vararray.c @@ -281,6 +281,7 @@ test_varlen_encdec(void *arg) out->len2 = 1; out->len3 = 1; out->len4 = 1; + tt_int_op(0, ==, varlen_setlen_a8(out, 0)); /* <= 1.4.4 had a bug here. */ varlen_setstr_str(out, "Y"); varlen_add_a8(out, 0); varlen_add_a16(out, 0);

1 0

[trunnel/master] 1.4.5
by nickm＠torproject.org 11 Jul '16

11 Jul '16

commit 1568c9ca281b4cd4d10ef65ef2bcf0a8a5006135 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 11 16:27:04 2016 -0400 1.4.5 --- lib/trunnel/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/trunnel/__init__.py b/lib/trunnel/__init__.py index c875874..2633dfd 100644 --- a/lib/trunnel/__init__.py +++ b/lib/trunnel/__init__.py @@ -3,4 +3,4 @@ # a package. # -__version__ = "1.4.4" +__version__ = "1.4.5"

1 0

[trunnel/master] It is not an error to set an array with allocated size 0 to have length 0.
by nickm＠torproject.org 11 Jul '16

11 Jul '16

commit 72da63f33808813869bfd7a99851da4307f34efb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 11 16:26:18 2016 -0400 It is not an error to set an array with allocated size 0 to have length 0. --- lib/trunnel/CodeGen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/trunnel/CodeGen.py b/lib/trunnel/CodeGen.py index 16047b3..69ba2e3 100644 --- a/lib/trunnel/CodeGen.py +++ b/lib/trunnel/CodeGen.py @@ -1488,7 +1488,7 @@ class AccessorFnGenerator(CodeGenerator): &inp->{c_name}.n_, inp->{c_name}.elts_, newlen, sizeof(inp->{c_name}.elts_[0]), {freefn}, &inp->trunnel_error_code_); - if (newptr == NULL) + if (newlen != 0 && newptr == NULL) goto trunnel_alloc_failed; inp->{c_name}.elts_ = newptr; return 0;""", c_name=sva.c_name, freefn=freefn)

1 0

[translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
by translation＠torproject.org 11 Jul '16

11 Jul '16

commit 0c073f0599f990f91604c0dfb5aef14fc8f9746b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 11 20:18:31 2016 +0000 Update translations for tails-openpgp-applet --- sk_SK/openpgp-applet.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sk_SK/openpgp-applet.pot b/sk_SK/openpgp-applet.pot index d86ddeb..9e9eaf5 100644 --- a/sk_SK/openpgp-applet.pot +++ b/sk_SK/openpgp-applet.pot @@ -51,7 +51,7 @@ msgstr "_Spravovať kľúče" #: bin/openpgp-applet:251 msgid "_Open Text Editor" -msgstr "" +msgstr "_Otvoriť textový editor" #: bin/openpgp-applet:295 msgid "The clipboard does not contain valid input data."

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 11 Jul '16

11 Jul '16

commit d7765c1e4773eb0ec4da0339404458386ca8c38d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 11 20:16:17 2016 +0000 Update translations for tails-misc --- sk_SK.po | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/sk_SK.po b/sk_SK.po index 00f624e..8afccab 100644 --- a/sk_SK.po +++ b/sk_SK.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Dasa M <littlearchr8(a)gmail.com>, 2016 # Marián Mižik <marian(a)mizik.sk>, 2015 # once, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-25 20:25+0200\n" -"PO-Revision-Date: 2016-05-27 10:12+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2016-06-06 14:26+0200\n" +"PO-Revision-Date: 2016-07-11 20:09+0000\n" +"Last-Translator: Dasa M <littlearchr8(a)gmail.com>\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/otf/torproject/language/sk_SK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -42,22 +43,22 @@ msgid "" "an opportunity for eavesdroppers, like your email or Internet provider, to\n" "confirm that you are using Tails.\n" "\n" -msgstr "" +msgstr "<h1>Pomôžte nám odstrániť chybu!</h1>\nPrečítajte si <a href=\"%s\">naše inštrukcie na nahlasovanie chýb </a>.\nNezadávajte viac osobných informácií, než\nje nevyhnutné!\n<h2>O zadávaní emailovej adresy</h2>\n\nZadanie emailovej adresy nám umožňuje kontaktovať Vás v prípade nejasností. To\nje potrebné pri väčšine oznamov, ktoré dostaneme, pretože väčšina oznamov\nbez kontaktných údajov je bezcenná. Na druhej strane taktiež poskytuje\npríležitosť pre tých, ktorý tajne odpočúvajú, ako poskytovateľ Vášho emailoveho konta alebo internetu,\nktorí chcú potvrdenie, že používate Tails\n\n" #: config/chroot_local-includes/usr/local/bin/electrum:17 msgid "Persistence is disabled for Electrum" -msgstr "" +msgstr "Persistence je vypnuté pre Electrum" #: config/chroot_local-includes/usr/local/bin/electrum:19 msgid "" "When you reboot Tails, all of Electrum's data will be lost, including your " "Bitcoin wallet. It is strongly recommended to only run Electrum when its " "persistence feature is activated." -msgstr "" +msgstr "Pri každom opätovnom spustení Tails, stratíte všetky dáta z Electrum, vrátane Vašej Bitcoin peňaženky. Je preto doporučené spúšťať Electrum len vtedy, ak je vlastnosť persistence aktivovaná." #: config/chroot_local-includes/usr/local/bin/electrum:21 msgid "Do you want to start Electrum anyway?" -msgstr "" +msgstr "Chcete nepriek tomu spustiť Electum?" #: config/chroot_local-includes/usr/local/bin/electrum:23 #: config/chroot_local-includes/usr/local/bin/icedove:37 @@ -101,7 +102,7 @@ msgstr "_Spravovať kľúče" #: config/chroot_local-includes/usr/local/bin/gpgApplet:208 msgid "_Open Text Editor" -msgstr "" +msgstr "_Otvoriť textový editor" #: config/chroot_local-includes/usr/local/bin/gpgApplet:252 msgid "The clipboard does not contain valid input data." @@ -233,21 +234,21 @@ msgstr "Ďalšie správy poskytnuté GnuPG:" #: config/chroot_local-includes/usr/local/bin/icedove:27 msgid "The Claws Mail persistence feature is activated." -msgstr "" +msgstr "Vlastnosť persistence Claws Mail je aktivovaná" #: config/chroot_local-includes/usr/local/bin/icedove:29 msgid "" "If you have emails saved in Claws Mail, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate" " your data</a> before starting Icedove." -msgstr "" +msgstr "Ak máte emaily uložené v Claws Mail, mali by ste <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>presunúť Vaše dáta</a> pred spustením Icedove." #: config/chroot_local-includes/usr/local/bin/icedove:34 msgid "" "If you already migrated your emails to Icedove, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>delete" " all your Claws Mail data</a> to remove this warning." -msgstr "" +msgstr "Ak ste už Vaše dáta presunuli do Icedove, mali by ste <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>zmazať Vaše Claws Mail dáta</a>, aby ste odstránili toto varovanie." #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 msgid "Restart" @@ -320,7 +321,7 @@ msgstr "Táto verzia Tails má známe bezpečnostné riziká:" #: config/chroot_local-includes/usr/local/bin/tails-security-check:156 msgid "Known security issues" -msgstr "" +msgstr "Známe bezpečnostné hrozby" #: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52 #, sh-format

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 11 Jul '16

11 Jul '16

commit c8df8032a4fe00d7de5f1c33f4869309866d1263 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 11 19:46:04 2016 +0000 Update translations for mat-gui_completed --- sk_SK.po | 190 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 190 insertions(+) diff --git a/sk_SK.po b/sk_SK.po new file mode 100644 index 0000000..b406d34 --- /dev/null +++ b/sk_SK.po @@ -0,0 +1,190 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Dasa M <littlearchr8(a)gmail.com>, 2016 +# Marián Mižik <marian(a)mizik.sk>, 2015 +# once, 2014 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-02-10 23:06+0100\n" +"PO-Revision-Date: 2016-07-11 19:43+0000\n" +"Last-Translator: Dasa M <littlearchr8(a)gmail.com>\n" +"Language-Team: Slovak (Slovakia) (http://www.transifex.com/otf/torproject/language/sk_SK/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sk_SK\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +#: mat-gui:66 mat-gui:422 mat-gui:445 +msgid "Ready" +msgstr "Pripravený" + +#: mat-gui:136 +msgid "Choose files" +msgstr "Vyberte súbory" + +#: mat-gui:144 +msgid "Supported files" +msgstr "Podporované súbory" + +#: mat-gui:151 +msgid "All files" +msgstr "Všetky súbory" + +#: mat-gui:167 mat-gui:366 mat-gui:417 mat-gui:441 mat-gui:443 +#: data/mat.glade:200 +msgid "Clean" +msgstr "Vyčistiť" + +#: mat-gui:168 +msgid "No metadata found" +msgstr "Neboli nájdené žiadne metadáta" + +#: mat-gui:170 mat-gui:419 +msgid "Dirty" +msgstr "Infikovaný" + +#: mat-gui:176 +#, python-format +msgid "%s's metadata" +msgstr "Metadáta %s's" + +#: mat-gui:187 +msgid "Trash your meta, keep your data" +msgstr "Vymazať metadáta, ponechať dáta" + +#: mat-gui:192 +msgid "Website" +msgstr "Webová stránka" + +#: mat-gui:219 +msgid "Preferences" +msgstr "Nastavenia" + +#: mat-gui:232 +msgid "Reduce PDF quality" +msgstr "Znížiť kvalitu PDF" + +#: mat-gui:235 +msgid "Reduce the produced PDF size and quality" +msgstr "Znížiť veľkosť a kvalitu výsledného PDF" + +#: mat-gui:238 +msgid "Remove unsupported file from archives" +msgstr "Odstrániť nepodporovaný súbor z archívov" + +#: mat-gui:241 +msgid "Remove non-supported (and so non-anonymised) file from output archive" +msgstr "Orstrániť nepodporovaný (a teda neanonimizovaný) súbor z výsledného archívu" + +#: mat-gui:280 +msgid "Unknown" +msgstr "Neznámy" + +#: mat-gui:325 +msgid "Not-supported" +msgstr "Nepodporovaný" + +#: mat-gui:339 +msgid "Harmless fileformat" +msgstr "Neškodný formát súboru" + +#: mat-gui:341 +msgid "Cant read file" +msgstr "Memôžem prečítať súbor" + +#: mat-gui:343 +msgid "Fileformat not supported" +msgstr "Formát súboru nepodporovaný" + +#: mat-gui:346 +msgid "These files can not be processed:" +msgstr "Tieto súbory nemôžu byť spracované:" + +#: mat-gui:351 mat-gui:380 data/mat.glade:239 +msgid "Filename" +msgstr "Názov súboru" + +#: mat-gui:353 +msgid "Reason" +msgstr "Dôvod" + +#: mat-gui:365 +msgid "Non-supported files in archive" +msgstr "Nepodporovaný súbor v archíve" + +#: mat-gui:379 +msgid "Include" +msgstr "Vrátane" + +#: mat-gui:397 +#, python-format +msgid "MAT is not able to clean the following files, found in the %s archive" +msgstr "MAT nedokáže úplne vyčistiť nasledujúce súbory nájdené v archíve %s" + +#: mat-gui:413 +#, python-format +msgid "Checking %s" +msgstr "Prebieha kontrola %s" + +#: mat-gui:428 +#, python-format +msgid "Cleaning %s" +msgstr "Prebieha čistenie %s" + +#: data/mat.glade:46 +msgid "_File" +msgstr "_Súbor" + +#: data/mat.glade:95 +msgid "_Edit" +msgstr "_Upraviť" + +#: data/mat.glade:141 +msgid "_Help" +msgstr "_Pomoc" + +#: data/mat.glade:187 +msgid "Add" +msgstr "Pridať" + +#: data/mat.glade:256 +msgid "State" +msgstr "Stav" + +#: data/mat.glade:294 data/mat.glade:467 +msgid "Metadata" +msgstr "Metadáta" + +#: data/mat.glade:354 +msgid "Name" +msgstr "Meno" + +#: data/mat.glade:368 +msgid "Content" +msgstr "Obsah" + +#: data/mat.glade:398 +msgid "Supported formats" +msgstr "Podporované formáty" + +#: data/mat.glade:456 +msgid "Support" +msgstr "Podpora" + +#: data/mat.glade:478 +msgid "Method" +msgstr "Metóda" + +#: data/mat.glade:489 +msgid "Remaining" +msgstr "Ostáva" + +#: data/mat.glade:518 +msgid "Fileformat" +msgstr "Formát súboru"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 11 Jul '16

11 Jul '16

commit 35a224ba9be0c5d996bdf49cc0351dcac3d038b7 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 11 19:45:57 2016 +0000 Update translations for mat-gui --- sk_SK.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sk_SK.po b/sk_SK.po index bf6704d..b406d34 100644 --- a/sk_SK.po +++ b/sk_SK.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2016-07-06 20:34+0000\n" +"PO-Revision-Date: 2016-07-11 19:43+0000\n" "Last-Translator: Dasa M <littlearchr8(a)gmail.com>\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/otf/torproject/language/sk_SK/)\n" "MIME-Version: 1.0\n" @@ -96,7 +96,7 @@ msgstr "Neškodný formát súboru" #: mat-gui:341 msgid "Cant read file" -msgstr "" +msgstr "Memôžem prečítať súbor" #: mat-gui:343 msgid "Fileformat not supported" @@ -116,11 +116,11 @@ msgstr "Dôvod" #: mat-gui:365 msgid "Non-supported files in archive" -msgstr "" +msgstr "Nepodporovaný súbor v archíve" #: mat-gui:379 msgid "Include" -msgstr "" +msgstr "Vrátane" #: mat-gui:397 #, python-format @@ -155,7 +155,7 @@ msgstr "Pridať" #: data/mat.glade:256 msgid "State" -msgstr "" +msgstr "Stav" #: data/mat.glade:294 data/mat.glade:467 msgid "Metadata" @@ -167,7 +167,7 @@ msgstr "Meno" #: data/mat.glade:368 msgid "Content" -msgstr "" +msgstr "Obsah" #: data/mat.glade:398 msgid "Supported formats" @@ -179,11 +179,11 @@ msgstr "Podpora" #: data/mat.glade:478 msgid "Method" -msgstr "" +msgstr "Metóda" #: data/mat.glade:489 msgid "Remaining" -msgstr "" +msgstr "Ostáva" #: data/mat.glade:518 msgid "Fileformat"

1 0

[nyx/master] Test torrc panel
by atagar＠torproject.org 11 Jul '16

11 Jul '16

commit f388d3b984001207bca9c423d5340a3e44ea857c Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jul 11 09:39:54 2016 -0700 Test torrc panel This panel is tiny enough that I'm not gonna break its draw function up for now. Just testing the whole panel instead. --- nyx/panel/torrc.py | 29 ++++++++++------- test/panel/__init__.py | 1 + test/panel/connection.py | 50 +++++++++++++++++++--------- test/panel/torrc.py | 84 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 137 insertions(+), 27 deletions(-) diff --git a/nyx/panel/torrc.py b/nyx/panel/torrc.py index 278fbeb..868e546 100644 --- a/nyx/panel/torrc.py +++ b/nyx/panel/torrc.py @@ -17,6 +17,17 @@ from stem import ControllerError from stem.control import State +def _read_torrc(path): + contents = [] + + with open(path) as torrc_file: + for line in torrc_file.readlines(): + line = line.replace('\t', ' ').replace('\xc2', "'").rstrip() + contents.append(filter(lambda char: char in string.printable, line)) + + return contents + + class TorrcPanel(panel.Panel): """ Renders the current torrc or nyxrc with syntax highlighting in a scrollable @@ -47,20 +58,14 @@ class TorrcPanel(panel.Panel): if event_type == State.RESET: try: self._torrc_location = expand_path(controller.get_info('config-file')) - contents = [] - - with open(self._torrc_location) as torrc_file: - for line in torrc_file.readlines(): - line = line.replace('\t', ' ').replace('\xc2', "'").rstrip() - contents.append(filter(lambda char: char in string.printable, line)) - - self._torrc_content = contents + self._torrc_content = _read_torrc(self._torrc_location) except ControllerError as exc: self._torrc_load_error = msg('panel.torrc.unable_to_find_torrc', error = exc) self._torrc_location = None self._torrc_content = None except Exception as exc: - self._torrc_load_error = msg('panel.torrc.unable_to_load_torrc', error = exc.strerror) + exc_msg = exc.strerror if (hasattr(exc, 'strerror') and exc.strerror) else str(exc) + self._torrc_load_error = msg('panel.torrc.unable_to_load_torrc', error = exc_msg) self._torrc_content = None def set_comments_visible(self, is_visible): @@ -121,7 +126,7 @@ class TorrcPanel(panel.Panel): if self._last_content_height > subwindow.height - 1: scroll_offset = 3 - subwindow.scrollbar(1, scroll, height - 1) + subwindow.scrollbar(1, scroll, subwindow.height - 1) y = 1 - scroll is_multiline = False # true if we're in the middle of a multiline torrc entry @@ -144,8 +149,8 @@ class TorrcPanel(panel.Panel): elif ' ' not in line.strip(): option, argument = line, '' # no argument else: - whitespace = ' ' * (len(line) - len(line.strip())) - option, argument = line.strip().split(' ', 1) + whitespace = ' ' * (len(line) - len(line.lstrip())) + option, argument = line.lstrip().split(' ', 1) option = whitespace + option + ' ' is_multiline = line.endswith('\\') # next line's part of a multi-line entry diff --git a/test/panel/__init__.py b/test/panel/__init__.py index f1a9d7d..9142e64 100644 --- a/test/panel/__init__.py +++ b/test/panel/__init__.py @@ -7,4 +7,5 @@ __all__ = [ 'graph', 'log', 'connection', + 'torrc', ] diff --git a/test/panel/connection.py b/test/panel/connection.py index 632ced0..30db919 100644 --- a/test/panel/connection.py +++ b/test/panel/connection.py @@ -118,30 +118,40 @@ def line(entry = MockEntry(), line_type = LineType.CONNECTION, connection = CONN class TestConnectionPanel(unittest.TestCase): @require_curses def test_draw_title(self): - self.assertEqual('Connection Details:', test.render(nyx.panel.connection._draw_title, [], True).content) - self.assertEqual('Connections:', test.render(nyx.panel.connection._draw_title, [], False).content) + rendered = test.render(nyx.panel.connection._draw_title, [], True) + self.assertEqual('Connection Details:', rendered.content) + + rendered = test.render(nyx.panel.connection._draw_title, [], False) + self.assertEqual('Connections:', rendered.content) entries = [MockEntry(entry_type = category) for category in (Category.INBOUND, Category.INBOUND, Category.OUTBOUND, Category.INBOUND, Category.CONTROL)] - self.assertEqual('Connections (3 inbound, 1 outbound, 1 control):', test.render(nyx.panel.connection._draw_title, entries, False).content) + + rendered = test.render(nyx.panel.connection._draw_title, entries, False) + self.assertEqual('Connections (3 inbound, 1 outbound, 1 control):', rendered.content) @require_curses def test_draw_details_incomplete_circuit(self): selected = line(line_type = LineType.CIRCUIT_HEADER, circ = MockCircuit(status = 'EXTENDING')) - self.assertEqual(DETAILS_BUILDING_CIRCUIT, test.render(nyx.panel.connection._draw_details, selected).content) + + rendered = test.render(nyx.panel.connection._draw_details, selected) + self.assertEqual(DETAILS_BUILDING_CIRCUIT, rendered.content) @require_curses @patch('nyx.tracker.get_consensus_tracker') def test_draw_details_no_consensus_data(self, consensus_tracker_mock): consensus_tracker_mock().get_relay_fingerprints.return_value = None - self.assertEqual(DETAILS_NO_CONSENSUS_DATA, test.render(nyx.panel.connection._draw_details, line()).content) + + rendered = test.render(nyx.panel.connection._draw_details, line()) + self.assertEqual(DETAILS_NO_CONSENSUS_DATA, rendered.content) @require_curses @patch('nyx.tracker.get_consensus_tracker') def test_draw_details_when_private(self, consensus_tracker_mock): consensus_tracker_mock().get_relay_fingerprints.return_value = None - selected = line(entry = MockEntry(is_private = True)) - self.assertEqual(DETAILS_WHEN_PRIVATE, test.render(nyx.panel.connection._draw_details, selected).content) + + rendered = test.render(nyx.panel.connection._draw_details, selected) + self.assertEqual(DETAILS_WHEN_PRIVATE, rendered.content) @require_curses @patch('nyx.panel.connection.tor_controller') @@ -168,7 +178,8 @@ class TestConnectionPanel(unittest.TestCase): 22: 'B6D83EC2D9E18B0A7A33428F8CFA9C536769E209' } - self.assertEqual(DETAILS_FOR_RELAY, test.render(nyx.panel.connection._draw_details, line()).content) + rendered = test.render(nyx.panel.connection._draw_details, line()) + self.assertEqual(DETAILS_FOR_RELAY, rendered.content) @require_curses @patch('nyx.tracker.get_consensus_tracker') @@ -179,7 +190,8 @@ class TestConnectionPanel(unittest.TestCase): 443: 'E0BD57A11F00041A9789577C53A1B784473669E4', } - self.assertEqual(DETAILS_FOR_MULTIPLE_MATCHES, test.render(nyx.panel.connection._draw_details, line()).content) + rendered = test.render(nyx.panel.connection._draw_details, line()) + self.assertEqual(DETAILS_FOR_MULTIPLE_MATCHES, rendered.content) @require_curses @patch('nyx.panel.connection.tor_controller') @@ -201,7 +213,8 @@ class TestConnectionPanel(unittest.TestCase): } for test_line, expected in test_data.items(): - self.assertEqual(expected, test.render(nyx.panel.connection._draw_line, 0, 0, test_line, False, 80, TIMESTAMP + 15.4).content) + rendered = test.render(nyx.panel.connection._draw_line, 0, 0, test_line, False, 80, TIMESTAMP + 15.4) + self.assertEqual(expected, rendered.content) @require_curses @patch('nyx.panel.connection.tor_controller') @@ -221,7 +234,8 @@ class TestConnectionPanel(unittest.TestCase): } for test_line, expected in test_data.items(): - self.assertEqual(expected, test.render(nyx.panel.connection._draw_address_column, 0, 0, test_line, ()).content) + rendered = test.render(nyx.panel.connection._draw_address_column, 0, 0, test_line, ()) + self.assertEqual(expected, rendered.content) @require_curses @patch('nyx.tracker.get_port_usage_tracker') @@ -242,15 +256,19 @@ class TestConnectionPanel(unittest.TestCase): } for test_line, expected in test_data.items(): - self.assertEqual(expected, test.render(nyx.panel.connection._draw_line_details, 0, 0, test_line, 80, ()).content) + rendered = test.render(nyx.panel.connection._draw_line_details, 0, 0, test_line, 80, ()) + self.assertEqual(expected, rendered.content) @require_curses def test_draw_right_column(self): - self.assertEqual(' 1.0m (INBOUND)', test.render(nyx.panel.connection._draw_right_column, 0, 0, line(), TIMESTAMP + 62, ()).content) + rendered = test.render(nyx.panel.connection._draw_right_column, 0, 0, line(), TIMESTAMP + 62, ()) + self.assertEqual(' 1.0m (INBOUND)', rendered.content) legacy_connection = Connection(TIMESTAMP, True, '127.0.0.1', 3531, '75.119.206.243', 22, 'tcp', False) test_line = line(entry = MockEntry(entry_type = Category.CONTROL), connection = legacy_connection) - self.assertEqual('+ 1.1m (CONTROL)', test.render(nyx.panel.connection._draw_right_column, 0, 0, test_line, TIMESTAMP + 68, ()).content) + + rendered = test.render(nyx.panel.connection._draw_right_column, 0, 0, test_line, TIMESTAMP + 68, ()) + self.assertEqual('+ 1.1m (CONTROL)', rendered.content) test_data = { '1F43EE37A0670301AD9CB555D94AFEC2C89FDE86': ' 1 / Guard', @@ -260,4 +278,6 @@ class TestConnectionPanel(unittest.TestCase): for fp, expected in test_data.items(): test_line = line(line_type = LineType.CIRCUIT, fingerprint = fp) - self.assertEqual(expected, test.render(nyx.panel.connection._draw_right_column, 0, 0, test_line, TIMESTAMP + 62, ()).content) + + rendered = test.render(nyx.panel.connection._draw_right_column, 0, 0, test_line, TIMESTAMP + 62, ()) + self.assertEqual(expected, rendered.content) diff --git a/test/panel/torrc.py b/test/panel/torrc.py new file mode 100644 index 0000000..96d222c --- /dev/null +++ b/test/panel/torrc.py @@ -0,0 +1,84 @@ +""" +Unit tests for nyx.panel.torrc. +""" + +import unittest + +import nyx.panel.torrc +import test + +from test import require_curses +from mock import patch, Mock + +TORRC = """ +ORPort 9050 +ControlPort 9051 +Exitpolicy reject *:* # non-exit relay +CookieAuthentication 1 +""".strip() + +RENDERED_DEFAULT = """ +Tor Configuration File (/path/to/torrc): +1 ORPort 9050 +2 ControlPort 9051 +3 Exitpolicy reject *:* # non-exit relay +4 CookieAuthentication 1 +""".strip() + +RENDERED_WITHOUT_COMMENTS = """ +Tor Configuration File (/path/to/torrc): +1 ORPort 9050 +2 ControlPort 9051 +3 Exitpolicy reject *:* +4 CookieAuthentication 1 +""".strip() + +RENDERED_WITHOUT_LINE_NUMBERS = """ +Tor Configuration File (/path/to/torrc): +ORPort 9050 +ControlPort 9051 +Exitpolicy reject *:* # non-exit relay +CookieAuthentication 1 +""".strip() + +RENDERED_WITH_ERROR = """ +Tor Configuration File (/path/to/torrc): +Unable to read our torrc: [Errno 2] No such file or directory: '/path/to/torrc' +""".strip() + + +class TestGraphPanel(unittest.TestCase): + @require_curses + @patch('nyx.panel.torrc._read_torrc', Mock(return_value = TORRC.splitlines())) + @patch('nyx.panel.torrc.expand_path', Mock(return_value = '/path/to/torrc')) + @patch('nyx.panel.torrc.tor_controller', Mock()) + def test_draw_with_content(self): + panel = nyx.panel.torrc.TorrcPanel() + self.assertEqual(RENDERED_DEFAULT, test.render(panel.draw).content) + + @require_curses + @patch('nyx.panel.torrc._read_torrc', Mock(return_value = TORRC.splitlines())) + @patch('nyx.panel.torrc.expand_path', Mock(return_value = '/path/to/torrc')) + @patch('nyx.panel.torrc.tor_controller', Mock()) + def test_draw_without_comments(self): + panel = nyx.panel.torrc.TorrcPanel() + panel._show_comments = False + self.assertEqual(RENDERED_WITHOUT_COMMENTS, test.render(panel.draw).content) + + @require_curses + @patch('nyx.panel.torrc._read_torrc', Mock(return_value = TORRC.splitlines())) + @patch('nyx.panel.torrc.expand_path', Mock(return_value = '/path/to/torrc')) + @patch('nyx.panel.torrc.tor_controller', Mock()) + def test_draw_without_line_numbers(self): + panel = nyx.panel.torrc.TorrcPanel() + panel._show_line_numbers = False + self.assertEqual(RENDERED_WITHOUT_LINE_NUMBERS, test.render(panel.draw).content) + + @require_curses + @patch('nyx.panel.torrc._read_torrc', Mock(side_effect = IOError("[Errno 2] No such file or directory: '/path/to/torrc'"))) + @patch('nyx.panel.torrc.expand_path', Mock(return_value = '/path/to/torrc')) + @patch('nyx.panel.torrc.tor_controller', Mock()) + def test_draw_with_error(self): + panel = nyx.panel.torrc.TorrcPanel() + panel._show_line_numbers = False + self.assertEqual(RENDERED_WITH_ERROR, test.render(panel.draw).content)

1 0

[nyx/master] Use draw() for torrc panel
by atagar＠torproject.org 11 Jul '16

11 Jul '16

commit c036eb9ef14c5f4556bd3396fe009ddc0215b4d0 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 10 13:32:50 2016 -0700 Use draw() for torrc panel --- nyx/panel/__init__.py | 2 +- nyx/panel/torrc.py | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index ca16f9e..7a1e4f2 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -266,7 +266,7 @@ class Panel(object): if not self.visible or HALT_ACTIVITY: return - if self.panel_name in ('header', 'graph', 'log', 'connections'): + if self.panel_name in ('header', 'graph', 'log', 'connections', 'torrc'): height = self.get_height() if self.get_height() != -1 else None width = self.get_width() if self.get_width() != -1 else None diff --git a/nyx/panel/torrc.py b/nyx/panel/torrc.py index 20b403d..278fbeb 100644 --- a/nyx/panel/torrc.py +++ b/nyx/panel/torrc.py @@ -103,11 +103,11 @@ class TorrcPanel(panel.Panel): nyx.panel.KeyHandler('l', 'line numbering', _toggle_line_numbers, 'on' if self._show_line_numbers else 'off'), ) - def draw(self, width, height): - scroll = self._scroller.location(self._last_content_height - 1, height - 1) + def draw(self, subwindow): + scroll = self._scroller.location(self._last_content_height - 1, subwindow.height - 1) if self._torrc_content is None: - self.addstr(1, 0, self._torrc_load_error, RED, BOLD) + subwindow.addstr(0, 1, self._torrc_load_error, RED, BOLD) new_content_height = 1 else: if not self._show_line_numbers: @@ -119,9 +119,9 @@ class TorrcPanel(panel.Panel): scroll_offset = 0 - if self._last_content_height > height - 1: + if self._last_content_height > subwindow.height - 1: scroll_offset = 3 - self.add_scroll_bar(scroll, scroll + height - 1, self._last_content_height - 1, 1) + subwindow.scrollbar(1, scroll, height - 1) y = 1 - scroll is_multiline = False # true if we're in the middle of a multiline torrc entry @@ -151,23 +151,23 @@ class TorrcPanel(panel.Panel): is_multiline = line.endswith('\\') # next line's part of a multi-line entry if self._show_line_numbers: - self.addstr(y, scroll_offset, str(line_number + 1).rjust(line_number_offset - 1), YELLOW, BOLD) + subwindow.addstr(scroll_offset, y, str(line_number + 1).rjust(line_number_offset - 1), YELLOW, BOLD) x = line_number_offset + scroll_offset min_x = line_number_offset + scroll_offset - x, y = self.addstr_wrap(y, x, option, width, min_x, GREEN, BOLD) - x, y = self.addstr_wrap(y, x, argument, width, min_x, CYAN, BOLD) - x, y = self.addstr_wrap(y, x, comment, width, min_x, WHITE) + x, y = subwindow.addstr_wrap(x, y, option, subwindow.width, min_x, GREEN, BOLD) + x, y = subwindow.addstr_wrap(x, y, argument, subwindow.width, min_x, CYAN, BOLD) + x, y = subwindow.addstr_wrap(x, y, comment, subwindow.width, min_x, WHITE) y += 1 new_content_height = y + scroll - 1 - self.addstr(0, 0, ' ' * width) # clear line + subwindow.addstr(0, 0, ' ' * subwindow.width) # clear line location = ' (%s)' % self._torrc_location if self._torrc_location else '' - self.addstr(0, 0, 'Tor Configuration File%s:' % location, HIGHLIGHT) + subwindow.addstr(0, 0, 'Tor Configuration File%s:' % location, HIGHLIGHT) if self._last_content_height != new_content_height: self._last_content_height = new_content_height - self.redraw(True) + self.draw(subwindow)

1 0

[nyx/master] Migrate and test torrc panel
by atagar＠torproject.org 11 Jul '16

11 Jul '16

commit 8db31995c703b716b6108e08c408e78fed22e368 Merge: b2bee4b f388d3b Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jul 11 09:56:56 2016 -0700 Migrate and test torrc panel Smallest and simplest of our panels but no complains from me - glad this overhaul's nearly done! Just one more panel to go. Rather than breaking this panel up right now just testing the whole thing. nyx/panel/__init__.py | 2 +- nyx/panel/torrc.py | 51 ++++++++++++++++------------- test/panel/__init__.py | 1 + test/panel/connection.py | 50 +++++++++++++++++++--------- test/panel/torrc.py | 84 ++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 149 insertions(+), 39 deletions(-)

1 0