Changeset 5711

Timestamp:

07/05/10 23:53:51 (3 years ago)

Author:

kosma

Message:

test_models.py: fix regression introduced in r5710 (avoid dst=127.0.0.1 in non-Windows because it hits looback interface)

Files:

• umpa/branches/link-layer-integration/tests/a_unit/test_extensions/test_models.py (modified) (3 diffs)

umpa/branches/link-layer-integration/tests/a_unit/test_extensions/test_models.py

@@ -32 +32 @@
 
 import py.test
+
+if os.name == 'nt':
+    # Windows doesn't have a loopback interface and wants us to send
+    # from a valid local address
+    revhosts_ip = '127.0.0.1'
+else:
+    # other OSes have a loopback interface (which we don't want to use here)
+    # and allow us to use any IP we like
+    revhosts_ip = '1.2.3.4'
 
 class SniffThread(threading.Thread):
@@ -77 +86 @@
         try:
             assert pkt[0].ip.src == "8.8.8.8"
-            assert pkt[0].ip.dst == "127.0.0.1"
-            assert pkt[1].ip.src == "127.0.0.1"
+            assert pkt[0].ip.dst == revhosts_ip
+            assert pkt[1].ip.src == revhosts_ip
             assert pkt[1].ip.dst == "8.8.8.8"
         except Exception, e:
@@ -166 +175 @@
         queue = Queue.Queue()
 
-        th = SendPacket(umit.umpa.Packet(IP(src="8.8.8.8", dst="127.0.0.1"),
+        th = SendPacket(umit.umpa.Packet(IP(src="8.8.8.8", dst=revhosts_ip),
                                          UDP(srcport=80, dstport=0)))
         th.start()