fix imports and some changed function names

tests/test_xtreemfs_client.py

@@ -3,18 +3,18 @@ import unittest
 import os
 import shutil
 
-import OSDManager
-import div_util
-import verify
+from xtreemfs_client import OSDManager
+from xtreemfs_client import div_util
+from xtreemfs_client import verify
 
 
 class TestDivUtil(unittest.TestCase):
     def test_remove_leading_trailing_slashes(self):
         s = '/hello/world////'
-        self.assertEqual(div_util.removeLeadingTrailingSlashes(s), 'hello/world')
+        self.assertEqual(div_util.remove_leading_trailing_slashes(s), 'hello/world')
 
         s = '/just_one_tile'
-        self.assertEqual(div_util.removeLeadingTrailingSlashes(s), 'just_one_tile')
+        self.assertEqual(div_util.remove_leading_trailing_slashes(s), 'just_one_tile')
 
 
 class TestXOSDManager(unittest.TestCase):
@@ -123,7 +123,7 @@ class TestXOSDManagerWithXtreemFS(unittest.TestCase):
         x_man = OSDManager.OSDManager(managed_folder)
         x_man.copy_folders(self.depth_2_dirs)
 
-        self.assertTrue(verify.verifyGMSFolder(managed_folder))
+        self.assertTrue(verify.verify_gms_folder(managed_folder))
 
         self.assertEqual(count_folder_and_files(managed_folder),
                          count_folder_and_files(os.path.join(self.tmp_folder, self.test_files_folder)))
@@ -153,7 +153,7 @@ class TestXOSDManagerWithXtreemFS(unittest.TestCase):
 
         self.assertEqual(count_folder_and_files(managed_folder),
                          count_folder_and_files(os.path.join(self.tmp_folder, self.test_files_folder)))
-        self.assertTrue(verify.verifyGMSFolder(managed_folder))
+        self.assertTrue(verify.verify_gms_folder(managed_folder))
 
     def test_update(self):
         managed_folder = os.path.join(self.mount_point_1, self.path_on_mount_point)

xtreemfs_client/verify.py

 import os
 
-import div_util
+from xtreemfs_client import div_util
 
 
 def verify_tile_folder(tile_folder, verbose):