[py-svn] r36802 - py/dist/py/test/rsession

fijal at codespeak.net fijal at codespeak.net
Tue Jan 16 13:57:28 CET 2007


Author: fijal
Date: Tue Jan 16 13:57:27 2007
New Revision: 36802

Modified:
   py/dist/py/test/rsession/rsession.py
Log:
Fix for test to pass (being able to override from config.option sessionoptions)


Modified: py/dist/py/test/rsession/rsession.py
==============================================================================
--- py/dist/py/test/rsession/rsession.py	(original)
+++ py/dist/py/test/rsession/rsession.py	Tue Jan 16 13:57:27 2007
@@ -54,10 +54,7 @@
     
     def bind_config(self, config):
         self.config = config
-        # copy to remote all options
-        for item, val in config.option.__dict__.items():
-            remote_options[item] = val
-        # as well as some options from us
+        # copy to remote session options
         try:
             ses_opt = self.config.getinitialvalue('SessionOptions').__dict__
         except ValueError:
@@ -68,6 +65,9 @@
             except KeyError:
                 val = self.defaults[key]
             remote_options[key] = val
+        # copy to remote all options
+        for item, val in config.option.__dict__.items():
+            remote_options[item] = val
     
     def __repr__(self):
         return "<SessionOptions %s>" % self.config



More information about the pytest-commit mailing list