find test is now tested in a separate directory

16 files changed, 10 insertions, 10 deletions

diff --git a/test/data/find_test/__init__.py b/test/data/find_test/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/data/find_test/__init__.py
diff --git a/test/data/find_test/foo.txt b/test/data/find_test/foo.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/data/find_test/foo.txt
diff --git a/test/data/find_test/module.py b/test/data/find_test/module.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/data/find_test/module.py
diff --git a/test/data/find_test/module2.py b/test/data/find_test/module2.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/data/find_test/module2.py
diff --git a/test/data/find_test/newlines.txt b/test/data/find_test/newlines.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/data/find_test/newlines.txt
diff --git a/test/data/find_test/noendingnewline.py b/test/data/find_test/noendingnewline.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/data/find_test/noendingnewline.py
diff --git a/test/data/find_test/nonregr.py b/test/data/find_test/nonregr.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/data/find_test/nonregr.py
diff --git a/test/data/find_test/normal_file.txt b/test/data/find_test/normal_file.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/data/find_test/normal_file.txt
diff --git a/test/data/find_test/spam.txt b/test/data/find_test/spam.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/data/find_test/spam.txt
diff --git a/test/data/find_test/sub/doc.txt b/test/data/find_test/sub/doc.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/data/find_test/sub/doc.txt
diff --git a/test/data/find_test/sub/momo.py b/test/data/find_test/sub/momo.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/data/find_test/sub/momo.py
diff --git a/test/data/find_test/test.ini b/test/data/find_test/test.ini
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/data/find_test/test.ini
diff --git a/test/data/find_test/test1.msg b/test/data/find_test/test1.msg
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/data/find_test/test1.msg
diff --git a/test/data/find_test/test2.msg b/test/data/find_test/test2.msg
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/data/find_test/test2.msg
diff --git a/test/data/find_test/write_protected_file.txt b/test/data/find_test/write_protected_file.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/data/find_test/write_protected_file.txt
diff --git a/test/unittest_shellutils.py b/test/unittest_shellutils.py
index d26ddb2..0298ca2 100644
--- a/test/unittest_shellutils.py
+++ b/test/unittest_shellutils.py
@@ -7,25 +7,25 @@ from logilab.common.testlib import TestCase, unittest_main
 
 from logilab.common.fileutils import *
 
-DATA_DIR = 'data'
+DATA_DIR = join('data','find_test')
 
 class FindTC(TestCase):
     def test_include(self):
-        files = find(DATA_DIR, '.py')
+        files = set(find(DATA_DIR, '.py'))
         self.assertSetEqual(files,
-                            [join('data', f) for f in ['__init__.py', 'module.py',
+                            set([join(DATA_DIR, f) for f in ['__init__.py', 'module.py',
                                                        'module2.py', 'noendingnewline.py',
-                                                       'nonregr.py', join('sub', 'momo.py')]])
-        files = find(DATA_DIR, ('.py',), blacklist=('sub',))
+                                                       'nonregr.py', join('sub', 'momo.py')]]))
+        files = set(find(DATA_DIR, ('.py',), blacklist=('sub',)))
         self.assertSetEqual(files,
-                            [join('data', f) for f in ['__init__.py', 'module.py',
+                            set([join(DATA_DIR, f) for f in ['__init__.py', 'module.py',
                                                        'module2.py', 'noendingnewline.py',
-                                                       'nonregr.py']])
+                                                       'nonregr.py']]))
         
     def test_exclude(self):
-        files = find(DATA_DIR, ('.py', '.pyc'), exclude=True)
+        files = set(find(DATA_DIR, ('.py', '.pyc'), exclude=True))
         self.assertSetEqual(files,
-                            [join('data', f) for f in ['foo.txt',
+                            set([join(DATA_DIR, f) for f in ['foo.txt',
                                                        'newlines.txt',
                                                        'normal_file.txt',
                                                        'test.ini',
@@ -34,7 +34,7 @@ class FindTC(TestCase):
                                                        'spam.txt',
                                                        join('sub', 'doc.txt'),
                                                        'write_protected_file.txt',
-                                                       ]])
+                                                       ]]))
         
 #    def test_exclude_base_dir(self):
 #        self.assertEquals(files_by_ext(DATA_DIR, include_exts=('.py',), exclude_dirs=(DATA_DIR,)),