[py-svn] r36643 - py/dist/py/test

[hpk at codespeak.net]

Author: hpk
Date: Sat Jan 13 13:33:09 2007
New Revision: 36643

Modified:
   py/dist/py/test/config.py
Log:
load the default options first,
so that custom options appear always 
at the end 


Modified: py/dist/py/test/config.py
==============================================================================
--- py/dist/py/test/config.py	(original)
+++ py/dist/py/test/config.py	Sat Jan 13 13:33:09 2007
@@ -179,9 +179,9 @@
 
     config = Config._config 
     # trigger loading conftest files which might add options!
+    config.loadconfig(defaultconfig).adddefaultoptions() 
     for configpath in configpaths: 
         config.loadconfig(configpath) 
-    config.loadconfig(defaultconfig).adddefaultoptions() 
     # each time we make a config object (which assembled cmdline 
     # options through py.test.addoptions() invocations) 
     # we want to reset and clean up the global state