a first very rough step towards python3

[nepi.git] / test / util / plotter.py

diff --git a/test/util/plotter.py b/test/util/plotter.py
index 4e1a553..b4ef5dc 100755 (executable)
--- a/test/util/plotter.py
+++ b/test/util/plotter.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
@@ -100,7 +99,7 @@ class PlotterTestCase(unittest.TestCase):
         apps = list()
         ifaces = list()
 
-        for i in xrange(node_count):
+        for i in range(node_count):
             node = ec.register_resource("dummy::Node")
             nodes.append(node)
             
@@ -108,7 +107,7 @@ class PlotterTestCase(unittest.TestCase):
             ec.register_connection(node, iface)
             ifaces.append(iface)
 
-            for i in xrange(app_count):
+            for i in range(app_count):
                 app = ec.register_resource("dummy::Application")
                 ec.register_connection(node, app)
                 apps.append(app)
@@ -118,20 +117,21 @@ class PlotterTestCase(unittest.TestCase):
         for iface in ifaces:
             ec.register_connection(link, iface)
        
-        fpath = ec.plot(persist = True)
+        fpath = ec.plot()
         statinfo = os.stat(fpath)
         size = statinfo.st_size
         self.assertTrue(size > 0)
         self.assertTrue(fpath.endswith(".png"))
 
-        fpath = ec.plot(persist = True, format = PFormats.DOT)
+        os.remove(fpath)
+
+        fpath = ec.plot(format = PFormats.DOT)
         statinfo = os.stat(fpath)
         size = statinfo.st_size
         self.assertTrue(size > 0)
         self.assertTrue(fpath.endswith(".dot"))
 
-        print fpath
-
+        os.remove(fpath)
 
 if __name__ == '__main__':
     unittest.main()