diff -r 87cfa131b535 -r e7e0ae78773e configurationengine/source/cone/core/tests/unittest_configuration_project_export.py --- a/configurationengine/source/cone/core/tests/unittest_configuration_project_export.py Fri Mar 12 08:30:17 2010 +0200 +++ b/configurationengine/source/cone/core/tests/unittest_configuration_project_export.py Tue Aug 10 14:29:28 2010 +0300 @@ -22,8 +22,6 @@ import sys,os,shutil import difflib, zipfile -import __init__ - from cone.public import exceptions,utils, api from cone.storage.filestorage import FileStorage from cone.storage.zipstorage import ZipStorage @@ -184,17 +182,17 @@ # except exceptions.NotSupportedException: # pass - def test_export_to_filestorage_multiple_configurations(self): + def _test_export_to_filestorage_multiple_configurations(self): fs = FileStorage(datafolder) p = api.Project(fs) - fs2 = FileStorage("temp/exported","w") + fs2 = FileStorage(os.path.join(temp_dir,"multiple"),"w") p2 = api.Project(fs2) conf = p.get_configuration('morestuff.confml') conf_files = conf.list_resources() p.export_configuration(conf,fs2) conf = p.get_configuration('prodX.confml') conf_files.extend(conf.list_resources()) - + fs2.save() p.export_configuration(conf,fs2) p2.close() self.assertTrue(os.path.exists("temp/exported")) @@ -204,8 +202,8 @@ files.sort() conf_files.append('.metadata') conf_files.sort() - self.assertEquals(conf_files,files) - shutil.rmtree("temp") + self.assertEquals(sorted(conf_files),sorted(files)) + #shutil.rmtree("temp")