Use curl for hsload test files

Author: mattjala

h5pyd/_hl/httpconn.py

@@ -574,8 +574,6 @@ def PUT(self, req, body=None, format="json", params=None, headers=None):
             headers["Content-Type"] = "application/json"
             data = json.dumps(body)
 
-        # Must be explicitly specified for Windows
-        headers["Content-Type"] += "; charset=utf-8"
         self.log.info("PUT: {} format: {} [{} bytes]".format(req, format, len(data)))
 
         try:

test/apps/load_files.py

@@ -15,7 +15,7 @@
 import sys
 import config
 import h5pyd
-
+from platform import system
 #
 # Main
 #
@@ -60,9 +60,15 @@
             # wget from S3
             http_path = test_file_http_path + filename
             print("downloading:", http_path)
-            rc = os.system(f"wget -q https://s3.amazonaws.com/hdfgroup/data/hdf5test/{filename} -P {data_dir}")
+
+            if system() == "Windows":
+                get_cmd = f"curl.exe -o {filename} https://s3.amazonaws.com/hdfgroup/data/hdf5test/{filename} --create-dirs --output-dir {data_dir}"
+            else:
+                get_cmd = f"wget -q https://s3.amazonaws.com/hdfgroup/data/hdf5test/{filename} -P {data_dir}"
+
+            rc = os.system(f"{get_cmd}")
             if rc != 0:
-                sys.exit("Failed to retreive test data file")
+                sys.exit(f"Failed to retreive test data file with error code {rc}")
     # run hsload for each file
     print(f"running hsload for {hdf5_path} to {test_folder}")
     rc = os.system(f"python ../../h5pyd/_apps/hsload.py {hdf5_path} {test_folder}")