From e3ebb6393d9ecd0d44cd85a0545c53ccefc9ab3a Mon Sep 17 00:00:00 2001 From: Rich Piazza Date: Fri, 27 Mar 2020 12:33:24 -0400 Subject: [PATCH] flaky --- stix2/pattern_visitor.py | 14 ++++++++------ stix2/test/v21/test_pattern_expressions.py | 8 ++++---- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/stix2/pattern_visitor.py b/stix2/pattern_visitor.py index 51e309f..f947437 100644 --- a/stix2/pattern_visitor.py +++ b/stix2/pattern_visitor.py @@ -3,14 +3,16 @@ import inspect from stix2patterns.exceptions import ParseException from stix2patterns.grammars.STIXPatternParser import TerminalNode - -from stix2patterns.v20.grammars.STIXPatternParser import STIXPatternParser as STIXPatternParser20 -from stix2patterns.v21.grammars.STIXPatternParser import STIXPatternParser as STIXPatternParser21 - -from stix2patterns.v20.grammars.STIXPatternVisitor import STIXPatternVisitor as STIXPatternVisitor20 -from stix2patterns.v21.grammars.STIXPatternVisitor import STIXPatternVisitor as STIXPatternVisitor21 from stix2patterns.grammars.STIXPatternVisitor import STIXPatternVisitor +from stix2patterns.v20.grammars.STIXPatternParser import \ + STIXPatternParser as STIXPatternParser20 +from stix2patterns.v20.grammars.STIXPatternVisitor import \ + STIXPatternVisitor as STIXPatternVisitor20 from stix2patterns.v20.pattern import Pattern as Pattern20 +from stix2patterns.v21.grammars.STIXPatternParser import \ + STIXPatternParser as STIXPatternParser21 +from stix2patterns.v21.grammars.STIXPatternVisitor import \ + STIXPatternVisitor as STIXPatternVisitor21 from stix2patterns.v21.pattern import Pattern as Pattern21 from .patterns import * diff --git a/stix2/test/v21/test_pattern_expressions.py b/stix2/test/v21/test_pattern_expressions.py index 502d7d3..804e88c 100644 --- a/stix2/test/v21/test_pattern_expressions.py +++ b/stix2/test/v21/test_pattern_expressions.py @@ -277,8 +277,8 @@ def test_and_observable_expression(): def test_parsing_and_observable_expression(): - exp = create_pattern_object("[user-account:account_type = 'unix' AND user-account:user_id = '1007' AND user-account:account_login = 'Peter'] AND [user-account:account_type = 'unix' AND user-account:user_id = '1008' AND user-account:account_login = 'Paul']") - assert str(exp) == "[user-account:account_type = 'unix' AND user-account:user_id = '1007' AND user-account:account_login = 'Peter'] AND [user-account:account_type = 'unix' AND user-account:user_id = '1008' AND user-account:account_login = 'Paul']" + exp = create_pattern_object("[user-account:account_type = 'unix' AND user-account:user_id = '1007' AND user-account:account_login = 'Peter'] AND [user-account:account_type = 'unix' AND user-account:user_id = '1008' AND user-account:account_login = 'Paul']") # noqa + assert str(exp) == "[user-account:account_type = 'unix' AND user-account:user_id = '1007' AND user-account:account_login = 'Peter'] AND [user-account:account_type = 'unix' AND user-account:user_id = '1008' AND user-account:account_login = 'Paul']" # noqa def test_or_observable_expression(): @@ -600,11 +600,11 @@ def test_parsing_repeat_and_within_qualified_expression(): def test_parsing_start_stop_qualified_expression(): patt_obj = create_pattern_object( - "[network-traffic:dst_ref.type = 'domain-name' AND network-traffic:dst_ref.value = 'example.com'] START t'2016-06-01T00:00:00Z' STOP t'2017-03-12T08:30:00Z'", + "[network-traffic:dst_ref.type = 'domain-name' AND network-traffic:dst_ref.value = 'example.com'] START t'2016-06-01T00:00:00Z' STOP t'2017-03-12T08:30:00Z'", # noqa ) assert str( patt_obj, - ) == "[network-traffic:dst_ref.type = 'domain-name' AND network-traffic:dst_ref.value = 'example.com'] START t'2016-06-01T00:00:00Z' STOP t'2017-03-12T08:30:00Z'" + ) == "[network-traffic:dst_ref.type = 'domain-name' AND network-traffic:dst_ref.value = 'example.com'] START t'2016-06-01T00:00:00Z' STOP t'2017-03-12T08:30:00Z'" # noqa def test_list_constant():