X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=test%2Ftest_syslog.py;h=5c697ee1e44ebb1b9f331d41f893e0ecb93660eb;hb=b1bfda207442177a14f08fc95b350684e5034c7f;hp=b407bdf6a55fa00bde95c3ae77e3aa19daf10f35;hpb=dd3c5d250f3cf9712e37e47851ca07401e715f13;p=vpp.git

diff --git a/test/test_syslog.py b/test/test_syslog.py
index b407bdf6a55..5c697ee1e44 100644
--- a/test/test_syslog.py
+++ b/test/test_syslog.py
@@ -18,7 +18,7 @@ class TestSyslog(VppTestCase):
         super(TestSyslog, cls).setUpClass()
 
         try:
-            cls.create_pg_interfaces(range(1))
+            cls.pg0, = cls.create_pg_interfaces(range(1))
             cls.pg0.admin_up()
             cls.pg0.config_ip4()
             cls.pg0.resolve_arp()
@@ -35,7 +35,7 @@ class TestSyslog(VppTestCase):
         :param facility: facility value
         :param severity: severity level
         :param appname: application name that originate message
-        :param msgid: message indetifier
+        :param msgid: message identifier
         :param sd: structured data (optional)
         :param msg: free-form message (optional)
         """
@@ -71,7 +71,7 @@ class TestSyslog(VppTestCase):
         :param facility: facility value
         :param severity: severity level
         :param appname: application name that originate message
-        :param msgid: message indetifier
+        :param msgid: message identifier
         :param sd: structured data (optional)
         :param msg: free-form message (optional)
         """
@@ -80,6 +80,10 @@ class TestSyslog(VppTestCase):
             sd = {}
         try:
             message = SyslogMessage.parse(message)
+        except ParseError as e:
+            self.logger.error(e)
+            raise
+        else:
             self.assertEqual(message.facility, facility)
             self.assertEqual(message.severity, severity)
             self.assertEqual(message.appname, appname)
@@ -88,8 +92,6 @@ class TestSyslog(VppTestCase):
             self.assertEqual(message.sd, sd)
             self.assertEqual(message.version, 1)
             self.assertEqual(message.hostname, self.pg0.local_ip4)
-        except ParseError as e:
-            self.logger.error(e)
 
     def test_syslog(self):
         """ Syslog Protocol test """
@@ -127,8 +129,8 @@ class TestSyslog(VppTestCase):
             self.assertEqual(capture[0][UDP].dport, 514)
             self.assert_packet_checksums_valid(capture[0], False)
         except:
-                self.logger.error(ppp("invalid packet:", capture[0]))
-                raise
+            self.logger.error(ppp("invalid packet:", capture[0]))
+            raise
         self.syslog_verify(capture[0][Raw].load,
                            SyslogFacility.local7,
                            SyslogSeverity.info,
@@ -182,8 +184,8 @@ class TestSyslog(VppTestCase):
         try:
             self.assertEqual(capture[0][UDP].dport, 12345)
         except:
-                self.logger.error(ppp("invalid packet:", capture[0]))
-                raise
+            self.logger.error(ppp("invalid packet:", capture[0]))
+            raise
         self.syslog_verify(capture[0][Raw].load,
                            SyslogFacility.local5,
                            SyslogSeverity.err,