[pygobject/pygobject-2-28] GIO tests: Fix for separate build tree
- From: Martin Pitt <martinpitt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pygobject/pygobject-2-28] GIO tests: Fix for separate build tree
- Date: Tue, 22 Mar 2011 12:33:34 +0000 (UTC)
commit 178df3e438835bec9b40dea243867784dee35815
Author: Martin Pitt <martin pitt ubuntu com>
Date: Tue Mar 22 13:21:27 2011 +0100
GIO tests: Fix for separate build tree
When using a separate build tree, "test_gio.py" is not in the current working
dir (which is the build tree), but in the srcdir. Use __file__ instead.
tests/test_gio.py | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/tests/test_gio.py b/tests/test_gio.py
index 7c8251e..6ce97ca 100644
--- a/tests/test_gio.py
+++ b/tests/test_gio.py
@@ -522,7 +522,7 @@ class TestGFileEnumerator(unittest.TestCase):
enumerator = self.file.enumerate_children(
"standard::*", gio.FILE_QUERY_INFO_NOFOLLOW_SYMLINKS)
for file_info in enumerator:
- if file_info.get_name() == 'test_gio.py':
+ if file_info.get_name() == os.path.basename(__file__):
break
else:
raise AssertionError
@@ -531,7 +531,7 @@ class TestGFileEnumerator(unittest.TestCase):
def callback(gfile, result):
try:
for file_info in gfile.enumerate_children_finish(result):
- if file_info.get_name() == 'test_gio.py':
+ if file_info.get_name() == __file__:
break
else:
raise AssertionError
@@ -547,7 +547,7 @@ class TestGFileEnumerator(unittest.TestCase):
def callback(enumerator, result):
try:
for file_info in enumerator.next_files_finish(result):
- if file_info.get_name() == 'test_gio.py':
+ if file_info.get_name() == __file__:
break
else:
raise AssertionError
@@ -594,7 +594,7 @@ class TestInputStream(unittest.TestCase):
self.assertEquals(self.stream.read(), '')
self.stream = gio.MemoryInputStream()
- some_data = open("test_gio.py", "rb").read()
+ some_data = open(__file__, "rb").read()
self.stream.add_data(some_data)
self.assertEquals(self.stream.read(), some_data)
@@ -631,7 +631,7 @@ class TestInputStream(unittest.TestCase):
'testing')
stream = gio.MemoryInputStream()
- some_data = open('test_gio.py', 'rb').read()
+ some_data = open(__file__, 'rb').read()
stream.add_data(some_data)
self.assertEquals(self._read_in_loop(stream,
lambda: stream.read_part(50),
@@ -807,7 +807,7 @@ class TestOutputStream(unittest.TestCase):
def test_write_part(self):
stream = gio.MemoryOutputStream()
- some_data = open('test_gio.py', 'rb').read()
+ some_data = open(__file__, 'rb').read()
buffer = some_data
# In fact this makes only one looping (memory stream is fast,
@@ -963,7 +963,7 @@ class TestContentTypeGuess(unittest.TestCase):
class TestFileInfo(unittest.TestCase):
def setUp(self):
- self.fileinfo = gio.File("test_gio.py").query_info("*")
+ self.fileinfo = gio.File(__file__).query_info("*")
def testListAttributes(self):
attributes = self.fileinfo.list_attributes("standard")
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]