Forgot to provide defaults to both versions of this function

[gc-dialer] / tests / test_startup.py

diff --git a/tests/test_startup.py b/tests/test_startup.py
index a469626..5058fc0 100644 (file)
--- a/tests/test_startup.py
+++ b/tests/test_startup.py
@@ -2,6 +2,7 @@ from __future__ import with_statement
 
 import os
 import time
 
 import os
 import time

+import warnings

 
 import test_utils
 
 
 import test_utils
 

@@ -31,43 +32,77 @@ def startup(factory):
        del handle
 
 
        del handle
 
 

-def test_startup_with_no_data_dir_with_dummy_hildon():
-       dc_glade.Dialcentral._data_path = os.path.join(os.path.dirname(__file__), "notexistent_data")
-       dc_glade.Dialcentral._user_settings = "%s/settings.ini" % dc_glade.Dialcentral._data_path
-
+def atest_startup_with_no_data_dir_with_dummy_hildon():
+       warnings.simplefilter("always")
+       hildonPath = os.path.join(os.path.dirname(__file__), "dummy_hildon")
+       sys.path.insert(0, hildonPath)
+       import hildon
+       dc_glade.hildon = hildon

        try:
        try:

-               sys.path.insert(0, "dummy_hildon")
-               startup(dc_glade.Dialcentral)
-               sys.path.remove("dummy_hildon")
+               dc_glade.Dialcentral._data_path = os.path.join(os.path.dirname(__file__), "notexistent_data")
+               dc_glade.Dialcentral._user_settings = "%s/settings.ini" % dc_glade.Dialcentral._data_path
+
+               try:
+                       startup(dc_glade.Dialcentral)
+               finally:
+                       try:
+                               os.remove(dc_glade.Dialcentral._user_settings)
+                       except:
+                               pass
+                       try:
+                               os.removedirs(dc_glade.Dialcentral._data_path)
+                       except:
+                               pass

        finally:
        finally:

-               os.remove(dc_glade.Dialcentral._user_settings)
-               os.removedirs(dc_glade.Dialcentral._data_path)
+               dc_glade.hildon = None
+               sys.path.remove(hildonPath)
+               warnings.resetwarnings()

 
 
 
 

-def test_startup_with_no_data_dir():
+def atest_startup_with_no_data_dir():
+       warnings.simplefilter("always")

        dc_glade.Dialcentral._data_path = os.path.join(os.path.dirname(__file__), "notexistent_data")
        dc_glade.Dialcentral._user_settings = "%s/settings.ini" % dc_glade.Dialcentral._data_path
 
        try:
                startup(dc_glade.Dialcentral)
        finally:
        dc_glade.Dialcentral._data_path = os.path.join(os.path.dirname(__file__), "notexistent_data")
        dc_glade.Dialcentral._user_settings = "%s/settings.ini" % dc_glade.Dialcentral._data_path
 
        try:
                startup(dc_glade.Dialcentral)
        finally:

-               os.remove(dc_glade.Dialcentral._user_settings)
-               os.removedirs(dc_glade.Dialcentral._data_path)
-
-
-def test_startup_with_empty_data_dir():
+               try:
+                       os.remove(dc_glade.Dialcentral._user_settings)
+               except:
+                       pass
+               try:
+                       os.removedirs(dc_glade.Dialcentral._data_path)
+               except:
+                       pass
+               warnings.resetwarnings()
+
+
+def atest_startup_with_empty_data_dir():
+       warnings.simplefilter("always")

        dc_glade.Dialcentral._data_path = os.path.join(os.path.dirname(__file__), "empty_data")
        dc_glade.Dialcentral._user_settings = "%s/settings.ini" % dc_glade.Dialcentral._data_path
 
        try:
                startup(dc_glade.Dialcentral)
        finally:
        dc_glade.Dialcentral._data_path = os.path.join(os.path.dirname(__file__), "empty_data")
        dc_glade.Dialcentral._user_settings = "%s/settings.ini" % dc_glade.Dialcentral._data_path
 
        try:
                startup(dc_glade.Dialcentral)
        finally:

-               os.remove(dc_glade.Dialcentral._user_settings)
-               os.removedirs(dc_glade.Dialcentral._data_path)
-
-
-def test_startup_with_basic_data_dir():
-       dc_glade.Dialcentral._data_path = os.path.join(os.path.dirname(__file__), "basic_data")
-       dc_glade.Dialcentral._user_settings = "%s/settings.ini" % dc_glade.Dialcentral._data_path
+               try:
+                       os.remove(dc_glade.Dialcentral._user_settings)
+               except:
+                       pass
+               try:
+                       os.removedirs(dc_glade.Dialcentral._data_path)
+               except:
+                       pass
+               warnings.resetwarnings()
+
+
+def atest_startup_with_basic_data_dir():
+       warnings.simplefilter("always")
+       try:
+               dc_glade.Dialcentral._data_path = os.path.join(os.path.dirname(__file__), "basic_data")
+               dc_glade.Dialcentral._user_settings = "%s/settings.ini" % dc_glade.Dialcentral._data_path

 
 

-       startup(dc_glade.Dialcentral)
+               startup(dc_glade.Dialcentral)
+       finally:
+               warnings.resetwarnings()