diff --git a/CHANGES b/CHANGES index 5d09e27fe0..54bd082464 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +2.5-beta-91 | 2016-10-20 11:40:37 -0400 + + * Fix istate.pybroccoli test on systems using Python 3. (Daniel Thayer) + 2.5-beta-89 | 2016-10-18 21:50:51 -0400 * SSH analyzer changes: the events are now restructured a bit. There is a new diff --git a/VERSION b/VERSION index d2c4057cd5..3ab12c57fb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.5-beta-89 +2.5-beta-91 diff --git a/testing/btest/istate/pybroccoli.py b/testing/btest/istate/pybroccoli.py index 9f26efca31..7600c2b7d4 100644 --- a/testing/btest/istate/pybroccoli.py +++ b/testing/btest/istate/pybroccoli.py @@ -8,8 +8,8 @@ # @TEST-EXEC: btest-bg-wait -k 20 # @TEST-EXEC: btest-diff bro/.stdout # -# @TEST-EXEC: sed 's/instance at [^>]*>/instance at >/' python/.stdout.filtered -# @TEST-EXEC: btest-diff python/.stdout.filtered +# @TEST-EXEC: sed -e 's/instance at [^>]*>/instance at >/' -e 's/object at [^>]*>/instance at >/' python/.stdout.filtered +# @TEST-EXEC: TEST_DIFF_CANONIFIER="sed -e 's/^\([-]*[0-9][0-9]*\)L/\1/' | $SCRIPTS/diff-remove-timestamps" btest-diff python/.stdout.filtered event remote_connection_closed(p: event_peer) {