Dropped directory content size calculation.

SandstoneHPC · Oct 25, 2016 · 25b666c · 25b666c
1 parent 49aa820
commit 25b666c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/sandstone/apps/filebrowser/posixfs.py b/sandstone/apps/filebrowser/posixfs.py
@@ -133,12 +133,12 @@ def get_dir_contents(dirpath):
                 if os.path.isdir(filepath):
                     filepath = os.path.join(filepath, '')
 
-                if os.path.isdir(filepath):
-                    size = PosixFS.get_size(filepath)
-                else:
-                    size = parts[5]
-                    if not size[-1].isalpha():
-                        size = size + ' bytes'
+                # if os.path.isdir(filepath):
+                #     size = PosixFS.get_size(filepath)
+                # else:
+                size = parts[5]
+                if not size[-1].isalpha():
+                    size = size + ' bytes'
 
                 dir_contents.append({
                     'size': size,

diff --git a/sandstone/lib/tests/python/test_filewatcher.py b/sandstone/lib/tests/python/test_filewatcher.py
@@ -39,7 +39,7 @@ def test_remove_directory_to_watch(self):
         Filewatcher.remove_directory_to_watch(self.test_dir)
         self.assertEqual(len(Filewatcher._watches), 0)
 
-    @mock.patch('sandstone.filewatcher.BroadcastManager.broadcast')
+    @mock.patch('sandstone.lib.broadcast.manager.BroadcastManager.broadcast')
     def test_file_created_event(self, mock_broadcast):
         Filewatcher.add_directory_to_watch(self.test_dir)
         # create temp file
@@ -58,7 +58,7 @@ def test_file_created_event(self, mock_broadcast):
         self.assertEqual(key, broadcast_call_msg.key)
         self.assertEqual(data, broadcast_call_msg.data)
 
-    @mock.patch('sandstone.filewatcher.BroadcastManager.broadcast')
+    @mock.patch('sandstone.lib.broadcast.manager.BroadcastManager.broadcast')
     def test_file_deleted_event(self, mock_broadcast):
         # create temp file
         filepath = os.path.join(self.test_dir, 'tmp.txt')
@@ -79,7 +79,7 @@ def test_file_deleted_event(self, mock_broadcast):
         self.assertEqual(key, broadcast_call_msg.key)
         self.assertEqual(data, broadcast_call_msg.data)
 
-    @mock.patch('sandstone.filewatcher.BroadcastManager.broadcast')
+    @mock.patch('sandstone.lib.broadcast.manager.BroadcastManager.broadcast')
     def test_file_moved_event(self, mock_broadcast):
         # create a temporary file
         filepath = os.path.join(self.test_dir, 'tmp.txt')