test tanner-parse-response #192

rjt-gupta · 2019-03-13T18:54:58Z

Added test for parse_tanner_response.
Increased test coverage of tanner_handler.py to 92%.
Refs - #187

rnehra01 · 2019-03-14T16:43:09Z

snare/tests/test_parse_tanner_response.py

+        self.loop.run_until_complete(test())
+        expected_header = {"content-type": "multipart/form-data"}
+        real_result = [self.res1, self.res2, self.res3, self.res4]
+        expected_result = [b'test.png', 'image/png', expected_header, 200]


Use variables self.expected_content, self.content_type and assign after detection. Also I think to maintain consistency we can make self.expected_header and self.expected_status_code in setUp method.

rnehra01 · 2019-03-14T16:44:21Z

@rjt-gupta Can you try to add the remaining cases to make coverage 100%?

rjt-gupta · 2019-03-14T16:52:09Z

Yes, Im working on it.

rjt-gupta · 2019-03-14T17:00:03Z

The expected status code is 200 throughout the test. I don't think we should self.expected_status_code in setUp method. what do you think? @rnehra01

rnehra01 · 2019-03-14T17:08:03Z

Look here.

rjt-gupta · 2019-03-14T17:24:12Z

Oh yes, I missed this as this part is not covered in the test yet. Will do the change surely :)

rjt-gupta · 2019-03-14T20:37:03Z

Done.

rnehra01 · 2019-03-15T09:16:31Z

snare/tests/test_parse_tanner_response.py

+
+    def test_parse_type_one_error(self):
+        self.detection = {"type": 1}
+        meta_content = {"/index.html": {}}


This can be removed.

Yes, even though I have simulated the test-case using something/ but there is no test that demonstrates this case which is also a possibility.
But your decision would be final, should I remove this?

This case need not be handled here, it can be checked in cloner.py. So I think it's good to keep it simple here.

rnehra01 · 2019-03-15T09:16:42Z

snare/tests/test_parse_tanner_response.py

+        self.detection = {"type": 1}
+        meta_content = {"/index.html": {}}
+        self.requested_name = 'something/'
+        self.handler = TannerHandler(self.args, meta_content, self.uuid)


This can be removed too.

rnehra01 · 2019-03-15T09:27:09Z

snare/tests/test_parse_tanner_response.py

@@ -105,17 +185,5 @@ def test_call_handle_html(self):
        self.loop.run_until_complete(test())
        self.handler.html_handler.handle_content.assert_called_with(self.call_content)

-    def test_parse_exception(self):


Why did you remove this?

The coverage is reached using new tests so no need for this one.

I think this test is for this when detection is empty then raises a keyError. Since the code to handle is not written (which is because is unlikely to happen), that's why it's not present in the coverage. So I guess no harm in keeping this.

rnehra01 · 2019-03-15T09:35:30Z

snare/tests/test_parse_tanner_response.py

+        self.detection = {
+            "type": 2,
+            "payload": {
+                "page": "/index.html",


In this case also you can simulate the error using

Suggested change

"page": "/index.html",

"page": "/something",

and remove line 142 and line 143

rnehra01 · 2019-03-15T09:38:26Z

snare/tests/test_parse_tanner_response.py

+        meta_content = {"/index.html": {}}
+        self.handler = TannerHandler(self.args, meta_content, self.uuid)
+        self.expected_content = b'<html><body><div>test</div></body></html>'
+        self.content_type = r'text\html'


I think it should be

Suggested change

self.content_type = r'text\html'

self.content_type = r'text/html'

Right?
And can you first make a separate PR to fix this

snare/snare/tanner_handler.py

Line 109 in c049841

content_type = r'text\html'

PR submitted.

rnehra01 · 2019-03-15T09:39:08Z

After this, how much is the test coverage?

rjt-gupta · 2019-03-15T11:17:57Z

Coverage is at 99%. How should I test this line?

rnehra01 · 2019-03-15T14:02:14Z

snare/tests/test_parse_tanner_response.py

@@ -105,17 +185,5 @@ def test_call_handle_html(self):
        self.loop.run_until_complete(test())
        self.handler.html_handler.handle_content.assert_called_with(self.call_content)

-    def test_parse_exception(self):


I think this test is for this when detection is empty then raises a keyError. Since the code to handle is not written (which is because is unlikely to happen), that's why it's not present in the coverage. So I guess no harm in keeping this.

rnehra01 · 2019-03-15T14:02:36Z

snare/tests/test_parse_tanner_response.py

+        meta_content = {"/index.html": {}}
+        self.handler = TannerHandler(self.args, meta_content, self.uuid)
+        self.expected_content = b'<html><body><div>test</div></body></html>'
+        self.content_type = r'text\html'


rnehra01 · 2019-03-15T14:14:43Z

Coverage is at 99%. How should I test this line?

I guess you can make error() a mock method and use assert_called.

rjt-gupta · 2019-03-25T15:53:36Z

Updated the changes.

rnehra01 · 2019-03-26T08:23:15Z

snare/tests/test_submit_data.py

 from snare.utils.asyncmock import AsyncMock
 from snare.tanner_handler import TannerHandler
 from snare.utils.page_path_generator import generate_unique_path

+logger = logging.getLogger(__name__)


Can you place it in setUp?

rnehra01 · 2019-03-26T08:23:18Z

snare/tests/test_submit_data.py

+            logger.error('Error submitting data: JSONDecodeError {}'.format(data))
+
+        self.handler = mock.Mock()
+        self.handler.submit_data = mock_json_decode_error


I think you should use this instead of mocking the entire submit_data method.

rnehra01 · 2019-03-26T08:24:43Z

snare/tests/test_submit_data.py

+    def test_submit_data_error(self):
+
+        async def mock_json_decode_error(data):
+            logger.error('Error submitting data: JSONDecodeError {}'.format(data))


Usually, logger creates a file for errors, is this also doing the same? If so please do the cleanup.

rjt-gupta · 2019-03-27T14:06:54Z

Done. 100% coverage reached.

rjt-gupta force-pushed the tanner-handler-tests branch from 64bb49f to ea38aa9 Compare March 14, 2019 09:34

rnehra01 requested changes Mar 14, 2019

View reviewed changes

rnehra01 requested changes Mar 15, 2019

View reviewed changes

rjt-gupta force-pushed the tanner-handler-tests branch from 08574bf to 0516d72 Compare March 15, 2019 10:56

rnehra01 requested changes Mar 15, 2019

View reviewed changes

rjt-gupta force-pushed the tanner-handler-tests branch from 0516d72 to c5e66af Compare March 15, 2019 14:25

rjt-gupta added 4 commits March 24, 2019 21:08

test tanner-parse-response

3d70820

test separated

ba76782

minor changes

8186a68

Increased coverage final

127f99e

rjt-gupta force-pushed the tanner-handler-tests branch from c5e66af to 127f99e Compare March 24, 2019 15:39

updated changes

9357b8d

rnehra01 requested changes Mar 26, 2019

View reviewed changes

100% reached

81e3d95

rnehra01 approved these changes Mar 28, 2019

View reviewed changes

rnehra01 merged commit b00eb70 into mushorg:master Mar 28, 2019

rjt-gupta deleted the tanner-handler-tests branch April 9, 2019 15:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

test tanner-parse-response #192

test tanner-parse-response #192

rjt-gupta commented Mar 13, 2019 •

edited

Loading

rnehra01 Mar 14, 2019

rnehra01 commented Mar 14, 2019

rjt-gupta commented Mar 14, 2019

rjt-gupta commented Mar 14, 2019 •

edited

Loading

rnehra01 commented Mar 14, 2019

rjt-gupta commented Mar 14, 2019 •

edited

Loading

rjt-gupta commented Mar 14, 2019

rnehra01 Mar 15, 2019

rjt-gupta Mar 15, 2019

rnehra01 Mar 15, 2019

rjt-gupta Mar 15, 2019

rnehra01 Mar 15, 2019

rnehra01 Mar 15, 2019

rjt-gupta Mar 15, 2019 •

edited

Loading

rnehra01 Mar 15, 2019

rnehra01 Mar 15, 2019

rnehra01 Mar 15, 2019

rjt-gupta Mar 15, 2019

rjt-gupta Mar 15, 2019

rnehra01 Mar 15, 2019

rnehra01 commented Mar 15, 2019

rjt-gupta commented Mar 15, 2019 •

edited

Loading

rnehra01 Mar 15, 2019

rnehra01 Mar 15, 2019

rnehra01 commented Mar 15, 2019

rjt-gupta commented Mar 25, 2019

rnehra01 Mar 26, 2019

rnehra01 Mar 26, 2019

rnehra01 Mar 26, 2019

rjt-gupta commented Mar 27, 2019

	self.content_type = r'text\html'
	self.content_type = r'text/html'

test tanner-parse-response #192

test tanner-parse-response #192

Conversation

rjt-gupta commented Mar 13, 2019 • edited Loading

Choose a reason for hiding this comment

rnehra01 commented Mar 14, 2019

rjt-gupta commented Mar 14, 2019

rjt-gupta commented Mar 14, 2019 • edited Loading

rnehra01 commented Mar 14, 2019

rjt-gupta commented Mar 14, 2019 • edited Loading

rjt-gupta commented Mar 14, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rjt-gupta Mar 15, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rnehra01 commented Mar 15, 2019

rjt-gupta commented Mar 15, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rnehra01 commented Mar 15, 2019

rjt-gupta commented Mar 25, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rjt-gupta commented Mar 27, 2019

rjt-gupta commented Mar 13, 2019 •

edited

Loading

rjt-gupta commented Mar 14, 2019 •

edited

Loading

rjt-gupta commented Mar 14, 2019 •

edited

Loading

rjt-gupta Mar 15, 2019 •

edited

Loading

rjt-gupta commented Mar 15, 2019 •

edited

Loading