[tor-commits] [bridgedb/master] 5935 - Tests should use a mix of IPv4 and IPv6

[aagbsn@xxxxxxxxxxxxxx]

commit b3ce8e419cee39d2111783d1d181ce94f7b392d1
Author: aagbsn <aagbsn@xxxxxxxx>
Date:   Wed Jun 13 18:36:11 2012 -0700

    5935 - Tests should use a mix of IPv4 and IPv6
    
    updated fakeBridge(), fakeBridge6() to randomly set the address
    class in or_addresses so that test coverage is more complete.
---
 lib/bridgedb/Tests.py |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/bridgedb/Tests.py b/lib/bridgedb/Tests.py
index 648835a..d14bc23 100644
--- a/lib/bridgedb/Tests.py
+++ b/lib/bridgedb/Tests.py
@@ -58,15 +58,17 @@ def randomPortSpec():
 
 def fakeBridge(orport=8080, running=True, stable=True, or_addresses=False):
     nn = "bridge-%s"%random.randrange(0,1000000)
-    ip = randomIP()
+    ip = ipaddr.IPAddress(randomIP())
     fp = "".join([random.choice("0123456789ABCDEF") for _ in xrange(40)])
     b = bridgedb.Bridges.Bridge(nn,ip,orport,fingerprint=fp)
     b.setStatus(running, stable)
 
     if or_addresses:
         for i in xrange(0,8):
+            if random.choice(xrange(2)): ip = randomIP()
+            else: ip = "[%s]"%randomIP6()
             address,portlist = bridgedb.Bridges.parseORAddressLine(
-                    "%s:%s" % (randomIP(),randomPortSpec()))
+                    "%s:%s" % (ip,randomPortSpec()))
             try:
                 portlist.add(b.or_addresses[address])
             except KeyError:
@@ -77,13 +79,15 @@ def fakeBridge(orport=8080, running=True, stable=True, or_addresses=False):
 
 def fakeBridge6(orport=8080, running=True, stable=True, or_addresses=False):
     nn = "bridge-%s"%random.randrange(0,1000000)
-    ip = randomIP6()
+    ip = ipaddr.IPAddress(randomIP6())
     fp = "".join([random.choice("0123456789ABCDEF") for _ in xrange(40)])
     b = bridgedb.Bridges.Bridge(nn,ip,orport,fingerprint=fp)
     b.setStatus(running, stable)
 
     if or_addresses:
         for i in xrange(0,8):
+            if random.choice(xrange(2)): ip = randomIP()
+            else: ip = "[%s]"%randomIP6()
             address,portlist = bridgedb.Bridges.parseORAddressLine(
                     "[%s]:%s" % (randomIP6(),randomPortSpec()))
             try:



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits