Merge pull request #531 from amarandon/move-ini-files

Move tests .ini files in sub folder
circus-tent · Sep 11, 2013 · fb28d3f · fb28d3f
2 parents c14c8ac + 628529b
commit fb28d3f
Show file tree

Hide file tree

Showing 36 changed files with 33 additions and 27 deletions.
diff --git a/circus/tests/circus.ini → circus/tests/config/circus.ini b/circus/tests/circus.ini → circus/tests/config/circus.ini
diff --git a/circus/tests/empty_include.ini → circus/tests/config/empty_include.ini b/circus/tests/empty_include.ini → circus/tests/config/empty_include.ini
diff --git a/circus/tests/env_section.ini → circus/tests/config/env_section.ini b/circus/tests/env_section.ini → circus/tests/config/env_section.ini
diff --git a/circus/tests/env_var.ini → circus/tests/config/env_var.ini b/circus/tests/env_var.ini → circus/tests/config/env_var.ini
diff --git a/circus/tests/hooks.ini → circus/tests/config/hooks.ini b/circus/tests/hooks.ini → circus/tests/config/hooks.ini
diff --git a/circus/tests/include.ini → circus/tests/config/include.ini b/circus/tests/include.ini → circus/tests/config/include.ini
diff --git a/circus/tests/include_dir.ini → circus/tests/config/include_dir.ini b/circus/tests/include_dir.ini → circus/tests/config/include_dir.ini
diff --git a/circus/tests/included-bar.ini → circus/tests/config/included-bar.ini b/circus/tests/included-bar.ini → circus/tests/config/included-bar.ini
diff --git a/circus/tests/included-foo.ini → circus/tests/config/included-foo.ini b/circus/tests/included-foo.ini → circus/tests/config/included-foo.ini
diff --git a/circus/tests/included/barbaz.ini → circus/tests/config/included/barbaz.ini b/circus/tests/included/barbaz.ini → circus/tests/config/included/barbaz.ini
diff --git a/circus/tests/included/foobar.ini → circus/tests/config/included/foobar.ini b/circus/tests/included/foobar.ini → circus/tests/config/included/foobar.ini
diff --git a/circus/tests/issue137.ini → circus/tests/config/issue137.ini b/circus/tests/issue137.ini → circus/tests/config/issue137.ini
diff --git a/circus/tests/issue210.ini → circus/tests/config/issue210.ini b/circus/tests/issue210.ini → circus/tests/config/issue210.ini
diff --git a/circus/tests/issue310.ini → circus/tests/config/issue310.ini b/circus/tests/issue310.ini → circus/tests/config/issue310.ini
diff --git a/circus/tests/issue395.ini → circus/tests/config/issue395.ini b/circus/tests/issue395.ini → circus/tests/config/issue395.ini
diff --git a/circus/tests/issue442.ini → circus/tests/config/issue442.ini b/circus/tests/issue442.ini → circus/tests/config/issue442.ini
diff --git a/circus/tests/issue53.ini → circus/tests/config/issue53.ini b/circus/tests/issue53.ini → circus/tests/config/issue53.ini
diff --git a/circus/tests/multiple_wildcard.ini → circus/tests/config/multiple_wildcard.ini b/circus/tests/multiple_wildcard.ini → circus/tests/config/multiple_wildcard.ini
diff --git a/...s/multiple_wildcard/subsubdir1/barbaz.ini → ...g/multiple_wildcard/subsubdir1/barbaz.ini b/...s/multiple_wildcard/subsubdir1/barbaz.ini → ...g/multiple_wildcard/subsubdir1/barbaz.ini
diff --git a/...s/multiple_wildcard/subsubdir2/foobar.ini → ...g/multiple_wildcard/subsubdir2/foobar.ini b/...s/multiple_wildcard/subsubdir2/foobar.ini → ...g/multiple_wildcard/subsubdir2/foobar.ini
diff --git a/circus/tests/reload_addplugins.ini → circus/tests/config/reload_addplugins.ini b/circus/tests/reload_addplugins.ini → circus/tests/config/reload_addplugins.ini
diff --git a/circus/tests/reload_addsockets.ini → circus/tests/config/reload_addsockets.ini b/circus/tests/reload_addsockets.ini → circus/tests/config/reload_addsockets.ini
diff --git a/circus/tests/reload_addwatchers.ini → circus/tests/config/reload_addwatchers.ini b/circus/tests/reload_addwatchers.ini → circus/tests/config/reload_addwatchers.ini
diff --git a/circus/tests/reload_base.ini → circus/tests/config/reload_base.ini b/circus/tests/reload_base.ini → circus/tests/config/reload_base.ini
diff --git a/circus/tests/reload_changearbiter.ini → circus/tests/config/reload_changearbiter.ini b/circus/tests/reload_changearbiter.ini → circus/tests/config/reload_changearbiter.ini
diff --git a/circus/tests/reload_changeplugins.ini → circus/tests/config/reload_changeplugins.ini b/circus/tests/reload_changeplugins.ini → circus/tests/config/reload_changeplugins.ini
diff --git a/circus/tests/reload_changesockets.ini → circus/tests/config/reload_changesockets.ini b/circus/tests/reload_changesockets.ini → circus/tests/config/reload_changesockets.ini
diff --git a/circus/tests/reload_changewatchers.ini → ...us/tests/config/reload_changewatchers.ini b/circus/tests/reload_changewatchers.ini → ...us/tests/config/reload_changewatchers.ini
diff --git a/circus/tests/reload_delplugins.ini → circus/tests/config/reload_delplugins.ini b/circus/tests/reload_delplugins.ini → circus/tests/config/reload_delplugins.ini
diff --git a/circus/tests/reload_delsockets.ini → circus/tests/config/reload_delsockets.ini b/circus/tests/reload_delsockets.ini → circus/tests/config/reload_delsockets.ini
diff --git a/circus/tests/reload_delwatchers.ini → circus/tests/config/reload_delwatchers.ini b/circus/tests/reload_delwatchers.ini → circus/tests/config/reload_delwatchers.ini
diff --git a/circus/tests/reload_numprocesses.ini → circus/tests/config/reload_numprocesses.ini b/circus/tests/reload_numprocesses.ini → circus/tests/config/reload_numprocesses.ini
diff --git a/circus/tests/test_web.ini → circus/tests/config/test_web.ini b/circus/tests/test_web.ini → circus/tests/config/test_web.ini
diff --git a/circus/tests/test_circusd.py b/circus/tests/test_circusd.py
@@ -12,7 +12,7 @@
 from circus.tests.support import has_gevent
 
 
-CIRCUS_INI = os.path.join(os.path.dirname(__file__), 'circus.ini')
+CIRCUS_INI = os.path.join(os.path.dirname(__file__), 'config', 'circus.ini')
 
 
 class TestCircusd(TestCase):

diff --git a/circus/tests/test_config.py b/circus/tests/test_config.py
@@ -10,22 +10,23 @@
 
 
 HERE = os.path.join(os.path.dirname(__file__))
+CONFIG_DIR = os.path.join(HERE, 'config')
 
 _CONF = {
-    'issue137': os.path.join(HERE, 'issue137.ini'),
-    'include': os.path.join(HERE, 'include.ini'),
-    'issue210': os.path.join(HERE, 'issue210.ini'),
-    'issue310': os.path.join(HERE, 'issue310.ini'),
-    'issue395': os.path.join(HERE, 'issue395.ini'),
-    'hooks': os.path.join(HERE, 'hooks.ini'),
-    'env_var': os.path.join(HERE, 'env_var.ini'),
-    'env_section': os.path.join(HERE, 'env_section.ini'),
-    'multiple_wildcard': os.path.join(HERE, 'multiple_wildcard.ini'),
-    'empty_include': os.path.join(HERE, 'empty_include.ini'),
-    'circus': os.path.join(HERE, 'circus.ini'),
-    'nope': os.path.join(HERE, 'nope.ini'),
-    'unexistant': os.path.join(HERE, 'unexistant.ini'),
-    'issue442': os.path.join(HERE, 'issue442.ini')
+    'issue137': os.path.join(CONFIG_DIR, 'issue137.ini'),
+    'include': os.path.join(CONFIG_DIR, 'include.ini'),
+    'issue210': os.path.join(CONFIG_DIR, 'issue210.ini'),
+    'issue310': os.path.join(CONFIG_DIR, 'issue310.ini'),
+    'issue395': os.path.join(CONFIG_DIR, 'issue395.ini'),
+    'hooks': os.path.join(CONFIG_DIR, 'hooks.ini'),
+    'env_var': os.path.join(CONFIG_DIR, 'env_var.ini'),
+    'env_section': os.path.join(CONFIG_DIR, 'env_section.ini'),
+    'multiple_wildcard': os.path.join(CONFIG_DIR, 'multiple_wildcard.ini'),
+    'empty_include': os.path.join(CONFIG_DIR, 'empty_include.ini'),
+    'circus': os.path.join(CONFIG_DIR, 'circus.ini'),
+    'nope': os.path.join(CONFIG_DIR, 'nope.ini'),
+    'unexistant': os.path.join(CONFIG_DIR, 'unexistant.ini'),
+    'issue442': os.path.join(CONFIG_DIR, 'issue442.ini')
 }
 
 

diff --git a/circus/tests/test_reloadconfig.py b/circus/tests/test_reloadconfig.py
@@ -5,20 +5,25 @@
 
 
 HERE = os.path.join(os.path.dirname(__file__))
+CONFIG_DIR = os.path.join(HERE, 'config')
 
 _CONF = {
-    'reload_base': os.path.join(HERE, 'reload_base.ini'),
-    'reload_numprocesses': os.path.join(HERE, 'reload_numprocesses.ini'),
-    'reload_addwatchers': os.path.join(HERE, 'reload_addwatchers.ini'),
-    'reload_delwatchers': os.path.join(HERE, 'reload_delwatchers.ini'),
-    'reload_changewatchers': os.path.join(HERE, 'reload_changewatchers.ini'),
-    'reload_addplugins': os.path.join(HERE, 'reload_addplugins.ini'),
-    'reload_delplugins': os.path.join(HERE, 'reload_delplugins.ini'),
-    'reload_changeplugins': os.path.join(HERE, 'reload_changeplugins.ini'),
-    'reload_addsockets': os.path.join(HERE, 'reload_addsockets.ini'),
-    'reload_delsockets': os.path.join(HERE, 'reload_delsockets.ini'),
-    'reload_changesockets': os.path.join(HERE, 'reload_changesockets.ini'),
-    'reload_changearbiter': os.path.join(HERE, 'reload_changearbiter.ini'),
+    'reload_base': os.path.join(CONFIG_DIR, 'reload_base.ini'),
+    'reload_numprocesses': os.path.join(CONFIG_DIR, 'reload_numprocesses.ini'),
+    'reload_addwatchers': os.path.join(CONFIG_DIR, 'reload_addwatchers.ini'),
+    'reload_delwatchers': os.path.join(CONFIG_DIR, 'reload_delwatchers.ini'),
+    'reload_changewatchers': os.path.join(CONFIG_DIR,
+                                          'reload_changewatchers.ini'),
+    'reload_addplugins': os.path.join(CONFIG_DIR, 'reload_addplugins.ini'),
+    'reload_delplugins': os.path.join(CONFIG_DIR, 'reload_delplugins.ini'),
+    'reload_changeplugins': os.path.join(CONFIG_DIR,
+                                         'reload_changeplugins.ini'),
+    'reload_addsockets': os.path.join(CONFIG_DIR, 'reload_addsockets.ini'),
+    'reload_delsockets': os.path.join(CONFIG_DIR, 'reload_delsockets.ini'),
+    'reload_changesockets': os.path.join(CONFIG_DIR,
+                                         'reload_changesockets.ini'),
+    'reload_changearbiter': os.path.join(CONFIG_DIR,
+                                         'reload_changearbiter.ini'),
 }