Merge pull request from gpotter2/critical-fix1

[Tests] Fix TZSP tests - Travis CI
This commit is contained in:
Guillaume Valadon 2018-02-23 14:59:01 +01:00 committed by GitHub
commit 229fd23870
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
scapy/contrib

View File

@ -380,7 +380,7 @@ assert(tzsp_tag_end.type == 1)
bind_layers(UDP, TZSP, dport=TZSP_PORT_DEFAULT)
SENSOR_ID = '1E:AT:DE:AD:BE:EF'
SENSOR_ID = b'1E:AT:DE:AD:BE:EF'
frm = Ether(src='00:01:01:01:01:01', dst='00:02:02:02:02:02') / \
IP(src='1.1.1.1', dst='2.2.2.2') / \
@ -408,7 +408,7 @@ assert(tzsp_tag_end.type == 1)
bind_layers(UDP, TZSP, dport=TZSP_PORT_DEFAULT)
SENSOR_ID = '1E:AT:DE:AD:BE:EF'
SENSOR_ID = b'1E:AT:DE:AD:BE:EF'
frm = Ether(src='00:01:01:01:01:01', dst='00:02:02:02:02:02') / \
IP(src='1.1.1.1', dst='2.2.2.2') / \