March 2013 - tor-commits - lists.torproject.org

[stem/master] Commenting tutorial use of curses.wrapper()
by atagar＠torproject.org 19 Mar '13

19 Mar '13

commit cbd83abf6e91955d84a87d3dada8548ad13ab99f Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 19 08:25:06 2013 -0700 Commenting tutorial use of curses.wrapper() Suggestion from Lunar for a rough spot in the tutorials. --- docs/tutorials/tortoise_and_the_hare.rst | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/docs/tutorials/tortoise_and_the_hare.rst b/docs/tutorials/tortoise_and_the_hare.rst index 4277f7c..a791103 100644 --- a/docs/tutorials/tortoise_and_the_hare.rst +++ b/docs/tutorials/tortoise_and_the_hare.rst @@ -60,6 +60,10 @@ uploaded. controller.authenticate() try: + # This makes curses initialize and call drawBandwidthGraph() with a + # reference to the screen, followed by additional arguments (in this + # case just the controller). + curses.wrapper(drawBandwidthGraph, controller) except KeyboardInterrupt: pass # the user hit ctrl+c

1 0

[stem/master] Tutorial wording revisions
by atagar＠torproject.org 19 Mar '13

19 Mar '13

commit 32244cdc3e8fbfff0cb9ca17f848ce8ede8ade3b Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 19 08:15:19 2013 -0700 Tutorial wording revisions Addressing various suggestions from Sean for improving the tutorials. --- docs/tutorials/mirror_mirror_on_the_wall.rst | 3 +++ docs/tutorials/the_little_relay_that_could.rst | 2 +- docs/tutorials/tortoise_and_the_hare.rst | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/tutorials/mirror_mirror_on_the_wall.rst b/docs/tutorials/mirror_mirror_on_the_wall.rst index 1a7f81d..f1080bd 100644 --- a/docs/tutorials/mirror_mirror_on_the_wall.rst +++ b/docs/tutorials/mirror_mirror_on_the_wall.rst @@ -1,6 +1,9 @@ Mirror Mirror on the Wall ========================= +The following is an overview of **Tor descriptors**. If you're already familiar +with what they are and where to get them then you may want to skip to the end. + * :ref:`what-is-a-descriptor` * :ref:`where-can-i-get-the-current-descriptors` * :ref:`where-can-i-get-past-descriptors` diff --git a/docs/tutorials/the_little_relay_that_could.rst b/docs/tutorials/the_little_relay_that_could.rst index 4f22b5b..74fbe46 100644 --- a/docs/tutorials/the_little_relay_that_could.rst +++ b/docs/tutorials/the_little_relay_that_could.rst @@ -42,7 +42,7 @@ the following configuration options... When you change your torrc you'll need to either restart Tor is issue a SIGHUP for the new settings to take effect. Now let's write a script that tells us how -many bytes Tor has sent and received... +many bytes Tor has sent and received since it started... :: diff --git a/docs/tutorials/tortoise_and_the_hare.rst b/docs/tutorials/tortoise_and_the_hare.rst index f575853..4277f7c 100644 --- a/docs/tutorials/tortoise_and_the_hare.rst +++ b/docs/tutorials/tortoise_and_the_hare.rst @@ -72,7 +72,9 @@ uploaded. bandwidth_rates = [(0, 0)] * GRAPH_WIDTH # Making a partial that wraps the window and bandwidth_rates with a function - # for Tor to call when it gets a BW event. + # for Tor to call when it gets a BW event. This causes the 'window' and + # 'bandwidth_rates' to be provided as the first two arguments whenever + # 'bw_event_handler()' is called. bw_event_handler = functools.partial(_handle_bandwidth_event, window, bandwidth_rates)

1 0

r26120: {website} Expanding project idea to include polishing off TorBEL Tweak (website/trunk/getinvolved/en)
by Damian Johnson 19 Mar '13

19 Mar '13

Author: atagar Date: 2013-03-19 14:45:18 +0000 (Tue, 19 Mar 2013) New Revision: 26120 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Expanding project idea to include polishing off TorBEL Tweaking the 'Stem Usability and Porting' idea to include tackling the remaining issues that prevent us from deploying TorBEL. Thanks to Sebastian for the list of tickets! Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2013-03-19 14:33:02 UTC (rev 26119) +++ website/trunk/getinvolved/en/volunteer.wml 2013-03-19 14:45:18 UTC (rev 26120) @@ -792,6 +792,11 @@ been inactive. + + Project Ideas: + <a href="#stemUsability">Stem Usability and Porting (this includes an idea for finishing off TorBEL)</a> + + <a id="project-tor2web"></a> <h3><a href="http://wiki.tor2web.org/index.php/Main_Page">Tor2web</a> (<a @@ -1023,7 +1028,7 @@ Skill Level: Medium - Likely Mentors: Damian (atagar) + Likely Mentors: Damian (atagar), Sebastian <a href="https://stem.torproject.org/">Stem</a> is a python controller library for tor. Like it's predecessor, <a @@ -1044,14 +1049,14 @@ Stem has largely met these goals but there's still plenty of low hanging fruit in terms of usability improvements. Also, we have clients still using - TorCtl that need to be ported over. This project includes several subtasks, - see the tickets for additional context... + TorCtl that need to be ported over. This project would include several + subtasks. Some ideas for instance are... <ol> <li>Come up with a better, more developer friendly "Module Overview" for our documentation (<a href="https://stem.torproject.org/api/control.html">example page</a>). For instance, it would be nice to provide interlinking between the overview and the classes/methods that it lists. This will probably involve asking for help from the <a href="http://sphinx-doc.org/">Sphinx user list</a>. (<a href="https://trac.torproject.org/7632">ticket</a>)</li> <li>Navigation of <a href="https://stem.torproject.org">stem's site</a> is clunky, in large part due to the linear page flow supported by sphinx. One possible fix for this would be css-only menus, ideally as a sphinx plugin so we could contribute it back upstream.(<a href="https://trac.torproject.org/8431">ticket</a>)</li> - <li>After getting some exposure to stem it would be time to give using it a try. Tor has a couple clients (<a href="https://trac.torproject.org/8263">TorBEL</a> and <a href="https://trac.torproject.org/8264">Tor Weather</a>) that are ready to be moved to stem. Hopefully porting these will also provide us with some lessons on how we can further improve stem's API.</li> + <li>After getting some exposure to stem it would be time to give using it a try. Tor has a couple clients (<a href="https://trac.torproject.org/8263">TorBEL</a> and <a href="https://trac.torproject.org/8264">Tor Weather</a>) that are ready to be moved to stem. Hopefully porting these will also provide us with some lessons on how we can further improve stem's API. Note that this would also involve polishing off <a href="#project-torbel">TorBEL</a>, including the <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">issues that prevent us from deploying it</a>. This later portion would be primarily mentored by Sebastian.</li> <li>... other ideas? The above are just some ideas I've come up with to improve usability and likely not enough to fill the summer. Feel free to suggest some of your own! For instance, one option would be to expand <a href="https://stem.torproject.org/tutorial.html">stem's tutorials</a> with more examples, maybe <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev/">contacting tor-dev@</a> to brainstorm ideas. This last bit is pretty open so I look forward to seeing what you come up with!</li> </ol>

1 0

r26119: {website} Adding a project idea for rewriting Doctor in python Cross m (website/trunk/getinvolved/en)
by Damian Johnson 19 Mar '13

19 Mar '13

Author: atagar Date: 2013-03-19 14:33:02 +0000 (Tue, 19 Mar 2013) New Revision: 26119 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Adding a project idea for rewriting Doctor in python Cross metrics/stem project from Karsten for rewriting Doctor in python, using stem for the descriptor support and expanding it to be able to remotely fetch descriptors. Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2013-03-19 04:02:00 UTC (rev 26118) +++ website/trunk/getinvolved/en/volunteer.wml 2013-03-19 14:33:02 UTC (rev 26119) @@ -603,6 +603,7 @@ Project Ideas: <a href="#txtorcon-stemIntegration">Txtorcon/Stem Integration</a> + <a href="#metrics-pyDoctor">PyDoctor</a> <a href="#stemUsability">Stem Usability and Porting</a> <a href="#stemTestingForTor">Stem Tests for Tor</a> @@ -655,6 +656,7 @@ Project Ideas: + <a href="#metrics-pyDoctor">PyDoctor</a> <a href="#metricsSearch">Searchable Tor descriptor and Metrics data archive</a> (Python/Django?) @@ -841,6 +843,33 @@ <ol> + <a id="metrics-pyDoctor"></a> + <li> + PyDoctor + + Effort Level: Medium + + Skill Level: Medium + + Likely Mentors: karsten, Damian (atagar) + <a href="https://gitweb.torproject.org/doctor.git">DocTor</a>, also + known as the consensus-health checker, is a service that periodically + checks the Tor network for consensus conflicts and other hiccups. In order + to do so it downloads the Tor consensus and votes from the Tor directory + authorities and checks them for consensus problems. DocTor writes its + findings to local files which can then be sent to a <a + href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-consensus-health">mailing + list</a> or IRC bot (nsa in #tor-bots on OFTC), or which can be served by + an <a href="https://metrics.torproject.org/consensus-health.html">HTTP + server</a>. + + This project would be about rewriting DocTor in Python and using Stem + for the descriptor parsing. This would require extending Stem to download + consensuses and votes (and later server descriptors for Damian's + consensus checker), and it would require rewriting the DocTor code in + Python. + </li> + <a id="txtorcon-stemIntegration"></a> <li> Txtorcon/Stem Integration

1 0

[stem/master] Switching the server descriptor's family to a set
by atagar＠torproject.org 19 Mar '13

19 Mar '13

commit 796ea199b44fbd0fe4d2b55faad1a1bdcd64bef0 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 19 07:09:50 2013 -0700 Switching the server descriptor's family to a set Suggestion from gsathya. Duplicate family entries are moot and order doesn't matter, so might as well make this a set. --- stem/descriptor/server_descriptor.py | 6 +++--- test/integ/descriptor/server_descriptor.py | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 102a660..bb7baa9 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -159,7 +159,7 @@ class ServerDescriptor(stem.descriptor.Descriptor): :var str contact: contact information :var stem.exit_policy.ExitPolicy exit_policy: **\*** stated exit policy :var stem.exit_policy.MicroExitPolicy exit_policy_v6: **\*** exit policy for IPv6 - :var list family: **\*** nicknames or fingerprints of declared family + :var set family: **\*** nicknames or fingerprints of declared family :var int average_bandwidth: **\*** average rate it's willing to relay in bytes/s :var int burst_bandwidth: **\*** burst rate it's willing to relay in bytes/s @@ -226,7 +226,7 @@ class ServerDescriptor(stem.descriptor.Descriptor): self.contact = None self.exit_policy = None self.exit_policy_v6 = stem.exit_policy.MicroExitPolicy("reject 1-65535") - self.family = [] + self.family = set() self.average_bandwidth = None self.burst_bandwidth = None @@ -500,7 +500,7 @@ class ServerDescriptor(stem.descriptor.Descriptor): elif validate: raise ValueError("Protocols line did not match the expected pattern: %s" % line) elif keyword == "family": - self.family = value.split(" ") + self.family = set(value.split(" ")) elif keyword == "eventdns": self.eventdns = value == "1" elif keyword == "ipv6-policy": diff --git a/test/integ/descriptor/server_descriptor.py b/test/integ/descriptor/server_descriptor.py index ec7c464..e3745c0 100644 --- a/test/integ/descriptor/server_descriptor.py +++ b/test/integ/descriptor/server_descriptor.py @@ -30,7 +30,7 @@ class TestServerDescriptor(unittest.TestCase): descriptor_file = open(get_resource("example_descriptor"), 'rb') - expected_family = [ + expected_family = set([ "$0CE3CFB1E9CC47B63EA8869813BF6FAB7D4540C1", "$1FD187E8F69A9B74C9202DC16A25B9E7744AB9F6", "$74FB5EFA6A46DE4060431D515DC9A790E6AD9A7C", @@ -39,7 +39,7 @@ class TestServerDescriptor(unittest.TestCase): "$D2F37F46182C23AB747787FD657E680B34EAF892", "$E0BD57A11F00041A9789577C53A1B784473669E4", "$E5E3E9A472EAF7BE9682B86E92305DB4C71048EF", - ] + ]) expected_onion_key = """-----BEGIN RSA PUBLIC KEY----- MIGJAoGBAJv5IIWQ+WDWYUdyA/0L8qbIkEVH/cwryZWoIaPAzINfrw1WfNZGtBmg @@ -133,7 +133,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertEquals(False, desc.extra_info_cache) self.assertEquals(None, desc.extra_info_digest) self.assertEquals(None, desc.hidden_service_dir) - self.assertEquals([], desc.family) + self.assertEquals(set(), desc.family) self.assertEquals(102400, desc.average_bandwidth) self.assertEquals(10485760, desc.burst_bandwidth) self.assertEquals(0, desc.observed_bandwidth) @@ -220,7 +220,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertEquals(False, desc.extra_info_cache) self.assertEquals("51E9FD0DA7C235D8C0250BAFB6E1ABB5F1EF9F04", desc.extra_info_digest) self.assertEquals(["2"], desc.hidden_service_dir) - self.assertEquals([], desc.family) + self.assertEquals(set(), desc.family) self.assertEquals(81920, desc.average_bandwidth) self.assertEquals(102400, desc.burst_bandwidth) self.assertEquals(84275, desc.observed_bandwidth) @@ -282,11 +282,11 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= descriptor_file = open(get_resource("bridge_descriptor"), 'rb') - expected_family = [ + expected_family = set([ "$CE396C72A3D0880F74C064FEA79D68C15BD380B9", "$AB8B00C00B1347BA80A88E548FAC9EDF701D7D0E", "$8C8A470D7C23151665A7B84E75E89FCC205A3304", - ] + ]) desc = next(stem.descriptor.parse_file(descriptor_file, "bridge-server-descriptor 1.0")) self.assertEquals("Unnamed", desc.nickname)

1 0

r26118: {website} removed tor-assistants address from contact website (website/trunk/about/en)
by Moritz Bartl 19 Mar '13

19 Mar '13

Author: moritz Date: 2013-03-19 04:02:00 +0000 (Tue, 19 Mar 2013) New Revision: 26118 Modified: website/trunk/about/en/contact.wml Log: removed tor-assistants address from contact website Modified: website/trunk/about/en/contact.wml =================================================================== --- website/trunk/about/en/contact.wml 2013-03-18 22:50:47 UTC (rev 26117) +++ website/trunk/about/en/contact.wml 2013-03-19 04:02:00 UTC (rev 26118) @@ -31,8 +31,6 @@ <a id="email"></a> <h3><a class="anchor" href="#email">Email</a></h3> - tor-assistants(a)torproject.org is the catch-all address for - everything else. It can be used for reaching people working on Tor. Please email <ew>help(a)rt.torproject.org for support or help questions. A few other addresses are more specific:

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 19 Mar '13

19 Mar '13

commit e1535826f1529ef3325a655a8f5f3c4ba189877f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 19 03:15:30 2013 +0000 Update translations for vidalia_help --- tr/config.po | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tr/config.po b/tr/config.po index 413300a..69b9ba3 100644 --- a/tr/config.po +++ b/tr/config.po @@ -2,20 +2,21 @@ # Translators: # Deniz <>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. +# <sosyalhizmetler(a)gmail.com>, 2013. # Tekel Bira <psycookie(a)gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2012-02-14 10:04+0000\n" -"Last-Translator: Tekel Bira <psycookie(a)gmail.com>\n" +"PO-Revision-Date: 2013-03-19 02:58+0000\n" +"Last-Translator: drstrangelove <sosyalhizmetler(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: tr\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #. type: Content of: <html><body><h1> #: en/config.html:16 @@ -54,7 +55,7 @@ msgid "" "of Tor installed, you can tell Vidalia which version you would like to run " "by clicking the Browse button and navigating to the particular Tor " "installation you want." -msgstr "" +msgstr "Tor Uygulaması: Bu görev çubuğunda Vidalia'yı çalıştırıp Başlat komutu verdiğinizde çalıştırılacak olan Tor uygulamasıdır. Eğer bilgisayarınızda birden çok Tor versiyonu yüklü ise, Göz at sekmesini tıklayıp, açılan pencerede istediğiniz versiyonu seçerek Vidalia uygulamasına tanıtabilirsiniz. " #. type: Content of: <html><body><ul><li> #: en/config.html:39 @@ -62,7 +63,7 @@ msgid "" "Startup Options: This setting allows you to have Vidalia " "automatically start Tor when Vidalia starts. You can also configure Vidalia " "to run when your system starts (Windows only)." -msgstr "" +msgstr "Başlangıç Ayarları: Bu ayar, Vidalia uygulamasını başlatınca otomatik olarak Tor uygulamasının da başlamasını sağlayacak olan ayardır. Dilerseniz, Vidalia uygulamasını bilgisayarınızın açılışı ile çalışmasını da etkinleştirebilirsiniz (Sadece Windows) " #. type: Content of: <html><body> #: en/config.html:46

1 0

[stem/master] Fixing open() mock for python 3
by atagar＠torproject.org 19 Mar '13

19 Mar '13

commit c40ea0fb2f2188d540655cfc4c6975bffc9585b2 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 18 16:19:39 2013 -0700 Fixing open() mock for python 3 Our unit tests were broken under python 3 due to needing a slightly different mock for the open() function. ====================================================================== ERROR: test_mirror_mirror_on_the_wall_2 ---------------------------------------------------------------------- Traceback: File "/home/atagar/Desktop/stem/test/data/python3/test/unit/tutorial.py", line 107, in test_mirror_mirror_on_the_wall_2 tutorial_example() File "/home/atagar/Desktop/stem/test/data/python3/test/unit/tutorial.py", line 95, in tutorial_example for desc in parse_file(open("/home/atagar/.tor/cached-consensus")): FileNotFoundError: [Errno 2] No such file or directory: '/home/atagar/.tor/cached-consensus' --- test/unit/tutorial.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/test/unit/tutorial.py b/test/unit/tutorial.py index 0aec3a3..d557fa0 100644 --- a/test/unit/tutorial.py +++ b/test/unit/tutorial.py @@ -11,6 +11,7 @@ import unittest from stem.control import Controller from stem.descriptor.reader import DescriptorReader from stem.descriptor.server_descriptor import RelayDescriptor +from stem.prereq import is_python_3 from test import mocking MIRROR_MIRROR_OUTPUT = """\ @@ -102,7 +103,12 @@ class TestTutorial(unittest.TestCase): mocking.support_with(test_file) test_file.name = "/home/atagar/.tor/cached-consensus" - mocking.mock(open, mocking.return_value(test_file)) + + if is_python_3(): + import builtins + mocking.mock(open, mocking.return_value(test_file), target_module = builtins) + else: + mocking.mock(open, mocking.return_value(test_file)) tutorial_example() self.assertEqual("found relay caerSidi (A7569A83B5706AB1B1A9CB52EFF7D2D32E4553EB)\n", self.stdout.getvalue())

1 0

[stem/master] The 'name' attribute of TarInfo classes can't be set in python 3
by atagar＠torproject.org 19 Mar '13

19 Mar '13

commit 98fd0a7ba4787340d05d0baf341594555da87d00 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 18 16:36:11 2013 -0700 The 'name' attribute of TarInfo classes can't be set in python 3 Workaround for the 'name' attribute being unwriteable in python 3. On reflection this is a little more elegant than our prior hack. :) Exception in thread Descriptor Reader: Traceback (most recent call last): File "/home/atagar/Python-3.3.0/Lib/threading.py", line 639, in _bootstrap_inner self.run() File "/home/atagar/Python-3.3.0/Lib/threading.py", line 596, in run self._target(*self._args, **self._kwargs) File "/home/atagar/Desktop/stem/test/data/python3/stem/descriptor/reader.py", line 435, in _read_descriptor_files self._handle_file(target, new_processed_files) File "/home/atagar/Desktop/stem/test/data/python3/stem/descriptor/reader.py", line 514, in _handle_file self._handle_archive(target) File "/home/atagar/Desktop/stem/test/data/python3/stem/descriptor/reader.py", line 557, in _handle_archive entry.name = target AttributeError: attribute 'name' of '_io.BufferedReader' objects is not writable --- stem/descriptor/reader.py | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py index f3b77ae..4fb6ff4 100644 --- a/stem/descriptor/reader.py +++ b/stem/descriptor/reader.py @@ -548,20 +548,13 @@ class DescriptorReader(object): if tar_entry.isfile(): entry = tar_file.extractfile(tar_entry) - # The parse_file() function uses the 'name' attribute to figure out - # the file that it came from. In the case of TarInfo instances the - # 'name' is the path within the archive. We'll want that for - # _set_archive_path(). - - archive_path = entry.name - entry.name = target - try: for desc in stem.descriptor.parse_file(entry, validate = self._validate, document_handler = self._document_handler): if self._is_stopped.isSet(): return - desc._set_archive_path(archive_path) + desc._set_path(os.path.abspath(target)) + desc._set_archive_path(entry.name) self._unreturned_descriptors.put(desc) self._iter_notice.set() except TypeError, exc:

1 0

[stem/master] Skipping tests that fail when run as root
by atagar＠torproject.org 19 Mar '13

19 Mar '13

commit 6862dc4994996e78ebf4516094c29aad66ceb524 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 18 18:20:35 2013 -0700 Skipping tests that fail when run as root Some of our integ tests rely on permission failures for files we lack access to, or path expansions. Running as root causes these to fail. Caught by Dererk... https://trac.torproject.org/7925 --- test/integ/descriptor/reader.py | 15 ++++++++++++++- test/integ/util/system.py | 13 +++++++++++++ 2 files changed, 27 insertions(+), 1 deletions(-) diff --git a/test/integ/descriptor/reader.py b/test/integ/descriptor/reader.py index 59e9c8c..4f92343 100644 --- a/test/integ/descriptor/reader.py +++ b/test/integ/descriptor/reader.py @@ -4,6 +4,7 @@ Integration tests for stem.descriptor.reader. from __future__ import with_statement +import getpass import os import signal import sys @@ -123,6 +124,12 @@ class TestDescriptorReader(unittest.TestCase): due to permissions. """ + # test relies on being unable to read a file + + if getpass.getuser() == 'root': + test.runner.skip(self, "(running as root)") + return + # Skip the test on windows, since you can only set the file's # read-only flag with os.chmod(). For more information see... # http://docs.python.org/library/os.html#os.chmod @@ -472,8 +479,14 @@ class TestDescriptorReader(unittest.TestCase): Listens for a file that's skipped because we lack read permissions. """ - if system.is_windows(): + # test relies on being unable to read a file + + if getpass.getuser() == 'root': + test.runner.skip(self, "(running as root)") + return + elif system.is_windows(): test.runner.skip(self, "(chmod not functional)") + return test_path = test.runner.get_runner().get_test_dir("secret_file") diff --git a/test/integ/util/system.py b/test/integ/util/system.py index 1528d05..7ad046d 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -387,6 +387,19 @@ class TestSystem(unittest.TestCase): Exercises the expand_path() method with actual runtime data. """ + # Some of the following tests get confused when ran as root. For instance, + # in my case... + # + # >>> os.path.expanduser("~") + # '/home/atagar' + # + # >>> os.path.expanduser("~root") + # '/root' + + if getpass.getuser() == 'root': + test.runner.skip(self, "(running as root)") + return + self.assertEquals(os.getcwd(), stem.util.system.expand_path(".")) self.assertEquals(os.getcwd(), stem.util.system.expand_path("./")) self.assertEquals(os.path.join(os.getcwd(), "foo"), stem.util.system.expand_path("./foo"))

1 0