<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/16542">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmoappdesc.py, tests: switch to python 3<br><br>Make build and external tests work with python3, so we can drop<br>the python2 dependency.<br><br>This should be merged shortly after osmo-python-tests was migrated to<br>python3, and the jenkins build slaves were (automatically) updated to<br>have the new osmo-python-tests installed.<br><br>Related: OS#2819<br>Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7<br>Change-Id: I344c49001fba23bdcfdef06ab174c52b60edd01c<br>---<br>M osmoappdesc.py<br>M tests/vty/vty_test_runner.py<br>2 files changed, 17 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/42/16542/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/osmoappdesc.py b/osmoappdesc.py</span><br><span>index 02ccda6..6c1bafa 100644</span><br><span>--- a/osmoappdesc.py</span><br><span>+++ b/osmoappdesc.py</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/usr/bin/env python</span><br><span style="color: hsl(120, 100%, 40%);">+#!/usr/bin/env python3</span><br><span> </span><br><span> app_configs = {</span><br><span> "osmo-stp": ["doc/examples/osmo-stp.cfg"],</span><br><span>diff --git a/tests/vty/vty_test_runner.py b/tests/vty/vty_test_runner.py</span><br><span>index 47ce23c..605bc93 100755</span><br><span>--- a/tests/vty/vty_test_runner.py</span><br><span>+++ b/tests/vty/vty_test_runner.py</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/usr/bin/env python2</span><br><span style="color: hsl(120, 100%, 40%);">+#!/usr/bin/env python3</span><br><span> </span><br><span> # (C) 2013 by Katerina Barone-Adesi <kat.obsc@gmail.com></span><br><span> # (C) 2013 by Holger Hans Peter Freyther</span><br><span>@@ -35,9 +35,9 @@</span><br><span> def checkForEndAndExit(self):</span><br><span> res = self.vty.command("list")</span><br><span> #print ('looking for "exit"\n')</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find(' exit\r') > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find(' exit\r') > 0)</span><br><span> #print 'found "exit"\nlooking for "end"\n'</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find(' end\r') > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find(' end\r') > 0)</span><br><span> #print 'found "end"\n'</span><br><span> </span><br><span> def vty_command(self):</span><br><span>@@ -56,8 +56,8 @@</span><br><span> try:</span><br><span> self.proc = osmoutil.popen_devnull(osmo_vty_cmd)</span><br><span> except OSError:</span><br><span style="color: hsl(0, 100%, 40%);">- print >> sys.stderr, "Current directory: %s" % os.getcwd()</span><br><span style="color: hsl(0, 100%, 40%);">- print >> sys.stderr, "Consider setting -b"</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Current directory: %s" % os.getcwd(), file=sys.stderr)</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Consider setting -b", file=sys.stderr)</span><br><span> </span><br><span> appstring = self.vty_app()[2]</span><br><span> appport = self.vty_app()[0]</span><br><span>@@ -89,22 +89,22 @@</span><br><span> line = fp.readline().strip()</span><br><span> if not line:</span><br><span> return False</span><br><span style="color: hsl(0, 100%, 40%);">- print "%s: parsing line: %s" %(path, line)</span><br><span style="color: hsl(120, 100%, 40%);">+ print("%s: parsing line: %s" %(path, line))</span><br><span> it = line.split()</span><br><span> if lport == int(it[5]):</span><br><span style="color: hsl(0, 100%, 40%);">- print "%s: local port %d found" %(path, lport)</span><br><span style="color: hsl(120, 100%, 40%);">+ print("%s: local port %d found" %(path, lport))</span><br><span> itaddr_list = it[8:]</span><br><span> if len(itaddr_list) != len(laddr_list):</span><br><span style="color: hsl(0, 100%, 40%);">- print "%s: addr list mismatch: %r vs %r" % (path, repr(itaddr_list), repr(laddr_list))</span><br><span style="color: hsl(120, 100%, 40%);">+ print("%s: addr list mismatch: %r vs %r" % (path, repr(itaddr_list), repr(laddr_list)))</span><br><span> continue</span><br><span> for addr in laddr_list:</span><br><span> if addr not in itaddr_list:</span><br><span style="color: hsl(0, 100%, 40%);">- print "%s: addr not found in list: %s vs %r" % (path, addr, repr(itaddr_list))</span><br><span style="color: hsl(120, 100%, 40%);">+ print("%s: addr not found in list: %s vs %r" % (path, addr, repr(itaddr_list)))</span><br><span> return False</span><br><span> return True</span><br><span> return False</span><br><span> except IOError as e:</span><br><span style="color: hsl(0, 100%, 40%);">- print "I/O error({0}): {1}".format(e.errno, e.strerror)</span><br><span style="color: hsl(120, 100%, 40%);">+ print("I/O error({0}): {1}".format(e.errno, e.strerror))</span><br><span> return False</span><br><span> </span><br><span> def testMultiHome(self):</span><br><span>@@ -115,9 +115,9 @@</span><br><span> found = True</span><br><span> break</span><br><span> else:</span><br><span style="color: hsl(0, 100%, 40%);">- print "[%d] osmo-stp not yet available, retrying in a second" % i</span><br><span style="color: hsl(120, 100%, 40%);">+ print("[%d] osmo-stp not yet available, retrying in a second" % i)</span><br><span> time.sleep(1)</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(found)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(found)</span><br><span> try:</span><br><span> proto = socket.IPPROTO_SCTP</span><br><span> except AttributeError: # it seems to be not defined under python2?</span><br><span>@@ -128,8 +128,8 @@</span><br><span> s.connect(('127.0.0.2',2905))</span><br><span> except socket.error as msg:</span><br><span> s.close()</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(False)</span><br><span style="color: hsl(0, 100%, 40%);">- print "Connected to STP through SCTP"</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(False)</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Connected to STP through SCTP")</span><br><span> s.close()</span><br><span> </span><br><span> if __name__ == '__main__':</span><br><span>@@ -158,9 +158,9 @@</span><br><span> if args.p:</span><br><span> confpath = args.p</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- print "confpath %s, workdir %s" % (confpath, workdir)</span><br><span style="color: hsl(120, 100%, 40%);">+ print("confpath %s, workdir %s" % (confpath, workdir))</span><br><span> os.chdir(workdir)</span><br><span style="color: hsl(0, 100%, 40%);">- print "Running tests for specific VTY commands"</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Running tests for specific VTY commands")</span><br><span> suite = unittest.TestSuite()</span><br><span> suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestVTYSTP))</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/16542">change 16542</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/libosmo-sccp/+/16542"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-sccp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I344c49001fba23bdcfdef06ab174c52b60edd01c </div>
<div style="display:none"> Gerrit-Change-Number: 16542 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>