Bump to 1.3.11-2

[gc-dialer] / tests / test_startup.py

diff --git a/tests/test_startup.py b/tests/test_startup.py
index 88d8807..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
 

@@ -11,67 +12,8 @@ sys.path.append("../src")
 import dc_glade
 
 
 import dc_glade
 
 

-def test_startup_with_no_data_dir():
-       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:
-               handle = dc_glade.Dialcentral()
-               with test_utils.expected(AssertionError("Attempting login before app is fully loaded")):
-                       handle.refresh_session()
-
-               for i in xrange(10):
-                       if handle._initDone:
-                               print "Completed init on iteration %d" % i
-                               break
-                       time.sleep(1)
-               assert handle._initDone
-
-               with test_utils.expected(RuntimeError("Login Failed")):
-                       handle.refresh_session()
-
-               handle._save_settings()
-
-               del handle
-       finally:
-               os.remove(dc_glade.Dialcentral._user_settings)
-               os.removedirs(dc_glade.Dialcentral._data_path)
-
-
-def test_startup_with_empty_data_dir():
-       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:
-               os.makedirs(dc_glade.Dialcentral._data_path)
-
-               handle = dc_glade.Dialcentral()
-               with test_utils.expected(AssertionError("Attempting login before app is fully loaded")):
-                       handle.refresh_session()
-
-               for i in xrange(10):
-                       if handle._initDone:
-                               print "Completed init on iteration %d" % i
-                               break
-                       time.sleep(1)
-               assert handle._initDone
-
-               with test_utils.expected(RuntimeError("Login Failed")):
-                       handle.refresh_session()
-
-               handle._save_settings()
-
-               del handle
-       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
-
-       handle = dc_glade.Dialcentral()
+def startup(factory):
+       handle = factory()

        with test_utils.expected(AssertionError("Attempting login before app is fully loaded")):
                handle.refresh_session()
 
        with test_utils.expected(AssertionError("Attempting login before app is fully loaded")):
                handle.refresh_session()
 

@@ -88,3 +30,79 @@ def test_startup_with_basic_data_dir():
        handle._save_settings()
 
        del handle
        handle._save_settings()
 
        del handle

+
+
+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:
+               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:
+               dc_glade.hildon = None
+               sys.path.remove(hildonPath)
+               warnings.resetwarnings()
+
+
+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:
+               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:
+               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)
+       finally:
+               warnings.resetwarnings()