Revision: 151
Author: jprantan
Date: Wed Jul 7 04:22:50 2010
Log: Updated to work when settings have default values.
http://code.google.com/p/robotframework-mabot/source/detail?r=151
Modified:
/trunk/utest/test_io.py
=======================================
--- /trunk/utest/test_io.py Wed Jul 7 03:54:15 2010
+++ /trunk/utest/test_io.py Wed Jul 7 04:22:50 2010
@@ -317,6 +317,9 @@
_TestIO.setUp(self)
shutil.copy(HTML_DATASOURCES_XML, HTML_DATASOURCES_XML+'.utest')
self.io.load_data(HTML_DATASOURCE_WITH_XML)
+ self._orig_always_load = SETTINGS["always_load_old_data_from_xml"]
+ self._orig_check = SETTINGS["check_simultaneous_save"]
+ SETTINGS["always_load_old_data_from_xml"] = True
def tearDown(self):
_TestIO.tearDown(self)
@@ -325,6 +328,8 @@
if os.path.exists(backup):
os.remove(backup)
DATA_MODIFIED.saved()
+ SETTINGS["always_load_old_data_from_xml"] = self._orig_always_load
+ SETTINGS["check_simultaneous_save"] = self._orig_check
def test_save_data_without_output(self):
generated = self.io._get_xml_generation_time()
@@ -358,25 +363,12 @@
os.remove(output)
def test_saving_when_data_is_reloaded_from_xml(self):
- self._prepare_settings_for_reload()
+ SETTINGS["check_simultaneous_save"] = True
self.io.xml_generated = "changed"
- try:
- saved, changes = self.io.save_data(HTML_DATASOURCES_XML, None)
- finally:
- self._restore_settings()
+ saved, changes = self.io.save_data(HTML_DATASOURCES_XML, None)
self.assertTrue(changes)
self.assertTrue(saved)
- def _prepare_settings_for_reload(self):
- self._orig_always_load = SETTINGS["always_load_old_data_from_xml"]
- self._orig_check = SETTINGS["check_simultaneous_save"]
- SETTINGS["always_load_old_data_from_xml"] = True
- SETTINGS["check_simultaneous_save"] = True
-
- def _restore_settings(self):
- SETTINGS["always_load_old_data_from_xml"] = self._orig_always_load
- SETTINGS["check_simultaneous_save"] = self._orig_check
-
if __name__ == "__main__":
unittest.main()
