replacing assertEquals into assertEqual

[nepi.git] / test / resources / linux / tap.py

diff --git a/test/resources/linux/tap.py b/test/resources/linux/tap.py
index 109fbb6..1cb1b8d 100755 (executable)
--- a/test/resources/linux/tap.py
+++ b/test/resources/linux/tap.py
@@ -4,9 +4,8 @@
 #    Copyright (C) 2013 INRIA
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 2 as
+#    published by the Free Software Foundation;
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -34,20 +33,23 @@ class LinuxTapTestCase(unittest.TestCase):
         self.netblock = "192.168.1"
 
     @skipIfNotAlive
-    def t_tap_create(self, host, user, identity):
+    def t_tap_create(self, host, user=None, identity=None):
 
-        ec = ExperimentController(exp_id = "test-tap-create")
+        ec = ExperimentController(exp_id="test-tap-create")
         
         node = ec.register_resource("linux::Node")
         ec.set(node, "hostname", host)
-        ec.set(node, "username", user)
-        ec.set(node, "identity", identity)
+
+        if host != "localhost":
+            ec.set(node, "username", user)
+            ec.set(node, "identity", identity)
+
         ec.set(node, "cleanExperiment", True)
         ec.set(node, "cleanProcesses", True)
 
         tap = ec.register_resource("linux::Tap")
-        ec.set(tap, "endpoint_ip", "%s.1" % self.netblock)
-        ec.set(tap, "endpoint_prefix", 24)
+        ec.set(tap, "ip", "%s.1" % self.netblock)
+        ec.set(tap, "prefix", "24")
         ec.register_connection(tap, node)
 
         app = ec.register_resource("linux::Application")
@@ -59,7 +61,7 @@ class LinuxTapTestCase(unittest.TestCase):
 
         ec.wait_finished(app)
 
-        ping = ec.trace(app, 'stdout')
+        ping = ec.trace(app, "stdout")
         expected = """3 packets transmitted, 3 received, 0% packet loss"""
         self.assertTrue(ping.find(expected) > -1)
         
@@ -71,6 +73,10 @@ class LinuxTapTestCase(unittest.TestCase):
     def test_tap_create(self):
         self.t_tap_create(self.host, self.user, self.identity)
 
+    def test_tap_create_local(self):
+        self.t_tap_create("localhost")
+
+
 if __name__ == '__main__':
     unittest.main()