summaryrefslogtreecommitdiffstats
path: root/test/unit/gluster
diff options
context:
space:
mode:
authorPrashanth Pai <ppai@redhat.com>2016-08-10 15:28:48 +0530
committerPrashanth Pai <ppai@redhat.com>2016-08-10 18:20:57 +0530
commit655b0d2793386d2059b9c682e931035a83619917 (patch)
treec1dfcc19202af123b649767c6a0bb5c4b340bd63 /test/unit/gluster
parentd4b8804abb876bda9803cee61c6c4298b475e6be (diff)
Move source files into gfapi/ dir
Currently, many source files are directly placed under gluster/ dir: gluster/exceptions.py gluster/gfapi.py gluster/utils.py When multiple packages (RPMs) are sharing the same gluster namespace, these source files will conflict if there are source files with same names provided by other projects. Fix: Move all source files in gluster/* to gluster/gfapi/* Note that this patch does not break how existing users import gfapi. Change-Id: Idf9d07eefafe8333215d6c61201c97c982565ba9 Signed-off-by: Prashanth Pai <ppai@redhat.com>
Diffstat (limited to 'test/unit/gluster')
-rw-r--r--test/unit/gluster/test_gfapi.py14
-rw-r--r--test/unit/gluster/test_utils.py4
2 files changed, 9 insertions, 9 deletions
diff --git a/test/unit/gluster/test_gfapi.py b/test/unit/gluster/test_gfapi.py
index 15ce061..4b58597 100644
--- a/test/unit/gluster/test_gfapi.py
+++ b/test/unit/gluster/test_gfapi.py
@@ -18,8 +18,8 @@ import math
import errno
from gluster.gfapi import File, Dir, Volume, DirEntry
-from gluster import api
-from gluster.exceptions import LibgfapiException
+from gluster.gfapi import api
+from gluster.gfapi.exceptions import LibgfapiException
from nose import SkipTest
from mock import Mock, MagicMock, patch
from contextlib import nested
@@ -483,7 +483,7 @@ class TestVolume(unittest.TestCase):
mock_glfs_creat = Mock()
mock_glfs_creat.return_value = 2
- with patch("gluster.api.glfs_creat", mock_glfs_creat):
+ with patch("gluster.gfapi.api.glfs_creat", mock_glfs_creat):
with File(self.vol.open("file.txt", os.O_CREAT, 0644)) as f:
self.assertTrue(isinstance(f, File))
self.assertEqual(mock_glfs_creat.call_count, 1)
@@ -849,7 +849,7 @@ class TestVolume(unittest.TestCase):
mock_glfs_open = Mock()
mock_glfs_open.return_value = 2
- with patch("gluster.api.glfs_open", mock_glfs_open):
+ with patch("gluster.gfapi.api.glfs_open", mock_glfs_open):
with File(self.vol.open("file.txt", os.O_WRONLY)) as f:
self.assertTrue(isinstance(f, File))
self.assertEqual(mock_glfs_open.call_count, 1)
@@ -864,14 +864,14 @@ class TestVolume(unittest.TestCase):
with self.vol.open("file.txt", os.O_WRONLY) as fd:
self.assertEqual(fd, None)
- with patch("gluster.api.glfs_open", mock_glfs_open):
+ with patch("gluster.gfapi.api.glfs_open", mock_glfs_open):
self.assertRaises(OSError, assert_open)
def test_open_direct_success(self):
mock_glfs_open = Mock()
mock_glfs_open.return_value = 2
- with patch("gluster.api.glfs_open", mock_glfs_open):
+ with patch("gluster.gfapi.api.glfs_open", mock_glfs_open):
f = File(self.vol.open("file.txt", os.O_WRONLY))
self.assertTrue(isinstance(f, File))
self.assertEqual(mock_glfs_open.call_count, 1)
@@ -882,7 +882,7 @@ class TestVolume(unittest.TestCase):
mock_glfs_open = Mock()
mock_glfs_open.return_value = None
- with patch("gluster.api.glfs_open", mock_glfs_open):
+ with patch("gluster.gfapi.api.glfs_open", mock_glfs_open):
self.assertRaises(OSError, self.vol.open, "file.txt", os.O_RDONLY)
def test_opendir_success(self):
diff --git a/test/unit/gluster/test_utils.py b/test/unit/gluster/test_utils.py
index 446bcd9..e58e225 100644
--- a/test/unit/gluster/test_utils.py
+++ b/test/unit/gluster/test_utils.py
@@ -10,8 +10,8 @@
import unittest
-from gluster import utils
-from gluster.exceptions import VolumeNotMounted
+from gluster.gfapi import utils
+from gluster.gfapi.exceptions import VolumeNotMounted
class TestUtils(unittest.TestCase):