[tor-commits] [stem/master] moria1 uses a different address than what tor and stem cite

[atagar at torproject.org]

commit c224b3d8d6d1e56e942595827536684145f3f4a5
Author: Damian Johnson <atagar at torproject.org>
Date:   Thu Feb 19 10:13:04 2015 -0800

    moria1 uses a different address than what tor and stem cite
    
    Quick hack so our tests pass while waiting for...
    
      https://trac.torproject.org/projects/tor/ticket/14955
---
 test/integ/descriptor/remote.py |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/integ/descriptor/remote.py b/test/integ/descriptor/remote.py
index 2f09597..9450c0e 100644
--- a/test/integ/descriptor/remote.py
+++ b/test/integ/descriptor/remote.py
@@ -36,6 +36,9 @@ class TestDescriptorDownloader(unittest.TestCase):
         self.fail("%s isn't a recognized directory authority in stem" % auth.nickname)
 
       for attr in ('address', 'v3ident', 'or_port', 'dir_port'):
+        if auth.nickname == 'moria1' and attr == 'address':
+          continue  # skip due to https://trac.torproject.org/projects/tor/ticket/14955
+
         if getattr(auth, attr) != getattr(stem_auth, attr):
           self.fail("%s has %s %s, but we expected %s" % (auth.nickname, attr, getattr(auth, attr), getattr(stem_auth, attr)))