From f09cf4867d97cb56d604df2d63f779e0630c2e88 Mon Sep 17 00:00:00 2001 From: "Desai, Kartikey H" Date: Thu, 5 Dec 2019 17:01:39 -0500 Subject: [PATCH] Remove unnecessary comments --- stix2/test/v21/test_base.py | 1 - stix2/test/v21/test_custom.py | 27 --------------------------- stix2/test/v21/test_observed_data.py | 7 ------- 3 files changed, 35 deletions(-) diff --git a/stix2/test/v21/test_base.py b/stix2/test/v21/test_base.py index f4006c5..325cf4b 100644 --- a/stix2/test/v21/test_base.py +++ b/stix2/test/v21/test_base.py @@ -29,7 +29,6 @@ def test_encode_json_object(): def test_deterministic_id_unicode(): mutex = {'name': u'D*Fl#Ed*\u00a3\u00a8', 'type': 'mutex'} - # CHANGED-parse_observable obs = stix2.parse(mutex, version="2.1") dd_idx = obs.id.index("--") diff --git a/stix2/test/v21/test_custom.py b/stix2/test/v21/test_custom.py index 3f68d8f..9c650eb 100644 --- a/stix2/test/v21/test_custom.py +++ b/stix2/test/v21/test_custom.py @@ -535,25 +535,6 @@ def test_custom_observable_object_invalid_refs_list_property(): assert "is named like a reference list property but is not a ListProperty containing ReferenceProperty" in str(excinfo.value) -# def test_custom_observable_object_invalid_valid_refs(): -# @stix2.v21.CustomObservable( -# 'x-new-obs', [ -# ('property1', stix2.properties.StringProperty(required=True)), -# ('property_ref', stix2.properties.ReferenceProperty(valid_types='email-addr')), -# ], -# ) -# class NewObs(): -# pass - -# with pytest.raises(Exception) as excinfo: -# NewObs( -# _valid_refs=['1'], -# property1='something', -# property_ref='1', -# ) -# assert "must be created with _valid_refs as a dict, not a list" in str(excinfo.value) - - def test_custom_no_properties_raises_exception(): with pytest.raises(TypeError): @@ -575,7 +556,6 @@ def test_parse_custom_observable_object(): "type": "x-new-observable", "property1": "something" }""" - # CHANGED-parse_observable nt = stix2.parse(nt_string, [], version='2.1') assert isinstance(nt, stix2.base._STIXBase) assert nt.property1 == 'something' @@ -588,10 +568,8 @@ def test_parse_unregistered_custom_observable_object(): }""" with pytest.raises(stix2.exceptions.ParseError) as excinfo: - # CHANGED-parse_observable stix2.parse(nt_string, version='2.1') assert "Can't parse unknown object type" in str(excinfo.value) - # CHANGED-parse_observable parsed_custom = stix2.parse(nt_string, allow_custom=True, version='2.1') assert parsed_custom['property1'] == 'something' with pytest.raises(AttributeError) as excinfo: @@ -605,7 +583,6 @@ def test_parse_unregistered_custom_observable_object_with_no_type(): }""" with pytest.raises(stix2.exceptions.ParseError) as excinfo: - # CHANGED-parse_observable stix2.parse(nt_string, allow_custom=True, version='2.1') assert "Can't parse object with no 'type' property" in str(excinfo.value) @@ -636,7 +613,6 @@ def test_parse_invalid_custom_observable_object(): }""" with pytest.raises(stix2.exceptions.ParseError) as excinfo: - # CHANGED-parse_observable stix2.parse(nt_string, version='2.1') assert "Can't parse object with no 'type' property" in str(excinfo.value) @@ -888,7 +864,6 @@ def test_parse_observable_with_custom_extension(): } } }""" - # CHANGED-parse_observable parsed = stix2.parse(input_str, version='2.1') assert parsed.extensions['x-new-ext'].property2 == 12 @@ -964,10 +939,8 @@ def test_custom_and_spec_extension_mix(): ) def test_parse_observable_with_unregistered_custom_extension(data): with pytest.raises(InvalidValueError) as excinfo: - # CHANGED-parse_observable stix2.parse(data, version='2.1') assert "Can't parse unknown extension type" in str(excinfo.value) - # CHANGED-parse_observable parsed_ob = stix2.parse(data, allow_custom=True, version='2.1') assert parsed_ob['extensions']['x-foobar-ext']['property1'] == 'foo' assert not isinstance(parsed_ob['extensions']['x-foobar-ext'], stix2.base._STIXBase) diff --git a/stix2/test/v21/test_observed_data.py b/stix2/test/v21/test_observed_data.py index f87bbf0..32bd0bf 100644 --- a/stix2/test/v21/test_observed_data.py +++ b/stix2/test/v21/test_observed_data.py @@ -369,7 +369,6 @@ def test_parse_autonomous_system_valid(data): ], ) def test_parse_email_address(data): - # CHANGED-parse_observable odata = stix2.parse(data, version='2.1') assert odata.type == "email-addr" @@ -379,7 +378,6 @@ def test_parse_email_address(data): '"belongs_to_ref": "mutex--9be6365f-b89c-48c0-9340-6953f6595718"', data, ) with pytest.raises(stix2.exceptions.InvalidValueError): - # CHANGED-parse_observable stix2.parse(odata_str, version='2.1') @@ -426,7 +424,6 @@ def test_parse_email_address(data): ], ) def test_parse_email_message(data): - # CHANGED-parse_observable odata = stix2.parse(data, version='2.1') assert odata.type == "email-message" assert odata.body_multipart[0].content_disposition == "inline" @@ -449,7 +446,6 @@ def test_parse_email_message(data): ) def test_parse_email_message_not_multipart(data): with pytest.raises(stix2.exceptions.DependentPropertiesError) as excinfo: - # CHANGED-parse_observable stix2.parse(data, version='2.1') assert excinfo.value.cls == stix2.v21.EmailMessage @@ -552,7 +548,6 @@ def test_parse_file_archive(data): ) def test_parse_email_message_with_at_least_one_error(data): with pytest.raises(stix2.exceptions.InvalidValueError) as excinfo: - # CHANGED-parse_observable stix2.parse(data, version='2.1') assert excinfo.value.cls == stix2.v21.EmailMessage @@ -575,7 +570,6 @@ def test_parse_email_message_with_at_least_one_error(data): ], ) def test_parse_basic_tcp_traffic(data): - # CHANGED-parse_observable odata = stix2.parse( data, version='2.1', ) @@ -608,7 +602,6 @@ def test_parse_basic_tcp_traffic(data): ) def test_parse_basic_tcp_traffic_with_error(data): with pytest.raises(stix2.exceptions.AtLeastOnePropertyError) as excinfo: - # CHANGED-parse_observable stix2.parse(data, version='2.1') assert excinfo.value.cls == stix2.v21.NetworkTraffic