quick check to see if we can revert changes to enable the integration tests to pass

Author: kenyaachon

jupyter_server/services/contents/filemanager.py

@@ -674,7 +674,7 @@ def check_folder_size(self, path):
         limit_str = f"{limit_mb}MB"
         limit_bytes = limit_mb * 1024 * 1024
         size = int(self._get_dir_size(self._get_os_path(path)))
-        size = size * 1024 if platform.system() == "Darwin" else size
+        # size = size * 1024 if platform.system() == "Darwin" else size
 
         if size > limit_bytes:
             raise web.HTTPError(
@@ -690,21 +690,21 @@ def _get_dir_size(self, path="."):
         calls the command line program du to get the directory size
         """
         try:
-            # result = subprocess.run(
-            #     ["du", "-s", "--block-size=1", path], capture_output=True
-            # ).stdout.split()
-            # self.log.info(f"current status of du command {result}")
-            # size = result[0].decode("utf-8")
-            if platform.system() == "Darwin":
-                result = subprocess.run(["du", "-sk", path], capture_output=True).stdout.split()
-
-            else:
-                result = subprocess.run(
-                    ["du", "-s", "--block-size=1", path], capture_output=True
-                ).stdout.split()
-
+            result = subprocess.run(
+                ["du", "-s", "--block-size=1", path], capture_output=True
+            ).stdout.split()
             self.log.info(f"current status of du command {result}")
             size = result[0].decode("utf-8")
+            # if platform.system() == "Darwin":
+            #     result = subprocess.run(["du", "-sk", path], capture_output=True).stdout.split()
+
+            # else:
+            #     result = subprocess.run(
+            #         ["du", "-s", "--block-size=1", path], capture_output=True
+            #     ).stdout.split()
+
+            # self.log.info(f"current status of du command {result}")
+            # size = result[0].decode("utf-8")
         except Exception as err:
             self.log.error(f"Error during directory copy: {err}")
             raise web.HTTPError(
@@ -1158,7 +1158,7 @@ async def check_folder_size(self, path: str) -> None:
         limit_str = f"{limit_mb}MB"
         limit_bytes = limit_mb * 1024 * 1024
         size = int(await self._get_dir_size(self._get_os_path(path)))
-        size = size * 1024 if platform.system() == "Darwin" else size
+        # size = size * 1024 if platform.system() == "Darwin" else size
         if size > limit_bytes:
             raise web.HTTPError(
                 400,
@@ -1173,17 +1173,17 @@ async def _get_dir_size(self, path: str = ".") -> str:
         calls the command line program du to get the directory size
         """
         try:
-            # result = subprocess.run(
-            #     ["du", "-s", "--block-size=1", path], capture_output=True
-            # ).stdout.split()
+            result = subprocess.run(
+                ["du", "-s", "--block-size=1", path], capture_output=True
+            ).stdout.split()
 
-            if platform.system() == "Darwin":
-                result = subprocess.run(["du", "-sk", path], capture_output=True).stdout.split()
+            # if platform.system() == "Darwin":
+            #     result = subprocess.run(["du", "-sk", path], capture_output=True).stdout.split()
 
-            else:
-                result = subprocess.run(
-                    ["du", "-s", "--block-size=1", path], capture_output=True
-                ).stdout.split()
+            # else:
+            #     result = subprocess.run(
+            #         ["du", "-s", "--block-size=1", path], capture_output=True
+            #     ).stdout.split()
 
             self.log.info(f"current status of du command {result}")
             size = result[0].decode("utf-8")