fix the bug (#47)

* fix the bug

* update changelog

* version bump

* fix test

* fix test for real

* add test for OrderedDicts

Author: timabrmsn

CHANGELOG.md

@@ -8,6 +8,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 The intended audience of this file is for py42 consumers -- as such, changes that don't affect
 how a consumer would use the library (e.g. adding unit tests, updating documentation, etc) are not captured here.
 
+## 0.5.2 - 2020-04-29
+
+### Fixed
+
+- Issue that prevented bulk csv loading. 
+
 ## 0.5.1 - 2020-04-27
 
 ### Fixed

src/code42cli/__version__.py

@@ -1 +1 @@
-__version__ = "0.5.1"
+__version__ = "0.5.2"

src/code42cli/bulk.py

@@ -85,7 +85,7 @@ def run(self):
         self._print_result()
 
     def _process_row(self, row):
-        if type(row) is dict:
+        if isinstance(row, dict):
             self._process_csv_row(row)
         elif row:
             self._process_flat_file_row(row.strip())

tests/test_bulk.py

@@ -1,3 +1,4 @@
+from collections import OrderedDict
 from io import IOBase
 import pytest
 
@@ -93,6 +94,28 @@ def test_run_bulk_process_when_not_given_reader_uses_csv_reader(bulk_processor_f
 
 
 class TestBulkProcessor(object):
+    def test_run_when_reader_returns_ordered_dict_process_kwargs(self, mock_open):
+        errors.ERRORED = False
+        processed_rows = []
+
+        def func_for_bulk(test1, test2):
+            processed_rows.append((test1, test2))
+
+        class MockDictReader(object):
+            def __call__(self, *args, **kwargs):
+                return [
+                    OrderedDict({"test1": 1, "test2": 2}),
+                    OrderedDict({"test1": 3, "test2": 4}),
+                    OrderedDict({"test1": 5, "test2": 6}),
+                ]
+
+        processor = BulkProcessor("some/path", func_for_bulk, MockDictReader())
+        processor.run()
+        assert (1, 2) in processed_rows
+        assert (3, 4) in processed_rows
+        assert (5, 6) in processed_rows
+        
+    
     def test_run_when_reader_returns_dict_process_kwargs(self, mock_open):
         errors.ERRORED = False
         processed_rows = []

tests/test_invoker.py

@@ -1,5 +1,8 @@
 import pytest
 
+from requests.exceptions import HTTPError
+from requests import Response
+
 from py42.exceptions import Py42ForbiddenError
 
 from code42cli import PRODUCT_NAME
@@ -74,8 +77,10 @@ def test_run_when_errors_occur_from_handler_calls_log_error(self, mocker, mock_p
 
     def test_run_when_forbidden_error_occurs_prints_message(self, mocker, mock_parser, capsys):
         mocker.patch("{}.invoker.log_error".format(PRODUCT_NAME))
+        http_error = mocker.MagicMock(spec=HTTPError)
+        http_error.response = mocker.MagicMock(spec=Response)
         cmd = Command("", "top level desc", subcommand_loader=load_subcommands)
-        mock_parser.parse_args.side_effect = Py42ForbiddenError(Exception())
+        mock_parser.parse_args.side_effect = Py42ForbiddenError(http_error)
         mock_subparser = mocker.MagicMock()
         mock_parser.prepare_command.return_value = mock_subparser
         invoker = CommandInvoker(cmd, mock_parser)