Fix up after adjustment to test behaviour in upload

Author: znicholls

src/cmip6_data_citation_generator/upload.py

@@ -1,10 +1,9 @@
-from os.path import isfile, isdir, join
+from os.path import isfile, join
 from glob import glob
 import json
 
 
 from netrc import netrc
-import httplib2
 from httplib2 import Http
 
 
@@ -41,4 +40,4 @@ def upload_jsons(inputs, test=False):
 
         errors = errors or not content.startswith("SUCCESS")
 
-    return errors
+    return 1 if errors else 0

tests/unit/test_upload.py

@@ -1,6 +1,5 @@
-from unittest.mock import patch, MagicMock
+from unittest.mock import patch
 import json
-import subprocess
 
 
 import pytest
@@ -12,13 +11,9 @@
 
 @patch("cmip6_data_citation_generator.upload.netrc")
 @patch("cmip6_data_citation_generator.upload.Http")
-@pytest.mark.parametrize(
-    "tinput,ttest,tcontent",
-    [
-        (TEST_VALID_OUTPUT_JSON, False, "SUCCESS content"),
-        (TEST_DATA_ROOT_DIR, True, "junk"),
-    ],
-)
+@pytest.mark.parametrize("tinput", (TEST_VALID_OUTPUT_JSON, TEST_DATA_ROOT_DIR))
+@pytest.mark.parametrize("ttest", (True, False))
+@pytest.mark.parametrize("tcontent", (b"SUCCESS content", b"junk"))
 def test_upload_file(mock_Http, mock_netrc, tinput, ttest, tcontent):
     tlogin = "login"
     tpassword = "pword"
@@ -27,31 +22,28 @@ class TResponse(object):
         status = "status"
 
     tresponse = TResponse()
-    tcontent = "SUCCESS content"
 
     with open(TEST_VALID_OUTPUT_JSON) as f:
         expected_data = json.dumps(json.load(f))
 
-    if ttest:
-        expected_dest = "http://ceracite.dkrz.de:5000/api/v1/citation?test=1"
-    else:
-        expected_dest = "http://ceracite.dkrz.de:5000/api/v1/citation"
-
     mock_netrc.return_value.authenticators.return_value = (tlogin, "", tpassword)
     mock_Http.return_value.request.return_value = (tresponse, tcontent)
 
     res = upload_jsons(tinput, test=ttest)
-    if tcontent.startswith("SUCCESS"):
+    if tcontent.decode("utf-8").startswith("SUCCESS") or ttest:
         assert res == 0
     else:
         assert res == 1
 
-    mock_netrc.return_value.authenticators.assert_called_with("cera")
-    mock_Http.return_value.add_credentials.assert_called_with(tlogin, tpassword)
+    if not ttest:
+        expected_dest = "http://ceracite.dkrz.de:5000/api/v1/citation"
+
+        mock_netrc.return_value.authenticators.assert_called_with("cera")
+        mock_Http.return_value.add_credentials.assert_called_with(tlogin, tpassword)
 
-    mock_Http.return_value.request.assert_called_with(
-        expected_dest,
-        "POST",
-        expected_data,
-        headers={"Content-Type": "application/json"},
-    )
+        mock_Http.return_value.request.assert_called_with(
+            expected_dest,
+            "POST",
+            expected_data,
+            headers={"Content-Type": "application/json"},
+        )