fix

camptocamp · Apr 18, 2013 · 1eeeda0 · 1eeeda0
1 parent ed72159
commit 1eeeda0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/.coveralls.yml b/.coveralls.yml
diff --git a/tilecloud_chain/tests/__init__.py b/tilecloud_chain/tests/__init__.py
@@ -12,9 +12,9 @@
 
 class CompareCase(TestCase):
 
-    def assert_result_equals(self, result, value, regexp=False):
-        content = unicode(result.decode('utf-8')).split('\n')
-        value = value.split('\n')
+    def assert_result_equals(self, result, content, regexp=False):
+        content = unicode(content.decode('utf-8')).split('\n')
+        value = result.split('\n')
         for n, test in enumerate(zip(content, value)):
             if test[0] != 'PASS...':
                 try:
@@ -47,7 +47,7 @@ def assert_cmd_equals(self, cmd, main_func, empty_err=False, **kargs):
         out, err = self.run_cmd(cmd, main_func)
         if empty_err:
             self.assertEquals(err, '')
-        self.assert_result_equals(value=out, **kargs)
+        self.assert_result_equals(content=out, **kargs)
 
     def assert_cmd_exit_equals(self, cmd, main_func, result):
         sys.argv = cmd.split(' ')
@@ -87,8 +87,8 @@ def assert_tiles_generated(self, directory, **kargs):
 
         self.assert_tiles_generated_deleted(directory=directory, **kargs)
 
-    def assert_tiles_generated_deleted(self, directory, tiles, **kargs):
-        self.assert_cmd_equals(**kargs)
+    def assert_tiles_generated_deleted(self, directory, tiles_pattern, tiles, result='', **kargs):
+        self.assert_cmd_equals(result=result, **kargs)
         count = 0
         for path, dirs, files in os.walk(directory):
             if len(files) != 0:

diff --git a/tilecloud_chain/tests/test_generate.py b/tilecloud_chain/tests/test_generate.py
@@ -487,9 +487,9 @@ def test_time_layer_bbox(self, l):
 #            regexp=True)
 #        l.check()
 
-    def _touch(self, pattern, tiles):
+    def _touch(self, tiles_pattern, tiles):
         for tile in tiles:
-            path = pattern % tile
+            path = tiles_pattern % tile
             directory = os.path.dirname(path)
             if not os.path.exists(directory):
                 os.makedirs(directory)
@@ -502,7 +502,7 @@ def test_delete_meta(self):
         if os.path.exists('/tmp/tiles/'):  # pragma: no cover
             shutil.rmtree('/tmp/tiles/')
         self._touch(
-            directory='/tmp/tiles/1.0.0/point_hash_no_meta/default/2012/swissgrid_5/0/%i/%i.png',
+            tiles_pattern='/tmp/tiles/1.0.0/point_hash_no_meta/default/2012/swissgrid_5/0/%i/%i.png',
             tiles=list(product(range(12), range(16)))
         )
         self.assert_tiles_generated_deleted(
@@ -521,8 +521,8 @@ def test_delete_no_meta(self):
         if os.path.exists('/tmp/tiles/'):
             shutil.rmtree('/tmp/tiles/')
         self._touch(
-            directory='/tmp/tiles/1.0.0/point_hash_no_meta/default/2012/swissgrid_5/0/%i/%i.png',
-            list(product(range(12), range(16)))
+            tiles_pattern='/tmp/tiles/1.0.0/point_hash_no_meta/default/2012/swissgrid_5/0/%i/%i.png',
+            tiles=list(product(range(12), range(16)))
         )
         self.assert_tiles_generated_deleted(
             cmd='./buildout/bin/generate_tiles -c tilegeneration/test.yaml -l point_hash_no_meta -z 0',

diff --git a/tilecloud_chain/tests/test_multihost.py b/tilecloud_chain/tests/test_multihost.py
@@ -32,16 +32,17 @@ def test_geodata(self):
             '--disable-database --disable-fillqueue --disable-tilesgen --host localhost',
             main_func=controller.main,
             directory=directory,
-            files=os.listdir('tilecloud_chain/tests/tilegeneration/hooks'),
-            out="""==== Sync geodata ====
+            tiles=os.listdir('tilecloud_chain/tests/tilegeneration/hooks'),
+            result="""==== Sync geodata ====
 """
         )
 
     @attr(none=True)
     def test_none(self):
         self.assert_cmd_equals(
-            cmd='./buildout/bin/generate_controller -c tilecloud_chain/tests/tilegeneration/test.yaml --disable-geodata '
-            '--disable-code --disable-database --disable-fillqueue --disable-tilesgen --host localhost',
+            cmd='./buildout/bin/generate_controller -c tilecloud_chain/tests/tilegeneration/test.yaml '
+            '--disable-geodata --disable-code --disable-database --disable-fillqueue --disable-tilesgen '
+            '--host localhost',
             main_func=controller.main,
             result='')
 
@@ -56,8 +57,8 @@ def test_code(self):
             )  # pragma: no cover
 
         out, err = self.run_cmd(
-            cmd='./buildout/bin/generate_controller -c tilecloud_chain/tests/tilegeneration/test.yaml --disable-geodata '
-            '--disable-database --disable-fillqueue --disable-tilesgen --host localhost',
+            cmd='./buildout/bin/generate_controller -c tilecloud_chain/tests/tilegeneration/test.yaml '
+            '--disable-geodata --disable-database --disable-fillqueue --disable-tilesgen --host localhost',
             main_func=controller.main)
         self.assertEquals(out, '==== Sync and build code ====\n')
         self.assertEquals(err, '')
@@ -75,8 +76,8 @@ def test_code(self):
     @attr(database=True)
     def test_database(self):
         out, err = self.run_cmd(
-            cmd='./buildout/bin/generate_controller -c tilecloud_chain/tests/tilegeneration/test.yaml --disable-geodata '
-            '--disable-code --disable-fillqueue --disable-tilesgen --host localhost',
+            cmd='./buildout/bin/generate_controller -c tilecloud_chain/tests/tilegeneration/test.yaml '
+            '--disable-geodata --disable-code --disable-fillqueue --disable-tilesgen --host localhost',
             main_func=controller.main)
         self.assertEquals(out, '==== Deploy database ====\n')
         self.assertEquals(err, '')