Expanded tests slightly

[gc-dialer] / tests / test_startup.py

diff --git a/tests/test_startup.py b/tests/test_startup.py
index 88d8807..a469626 100644 (file)
--- a/tests/test_startup.py
+++ b/tests/test_startup.py
@@ -11,28 +11,45 @@ sys.path.append("../src")
 import dc_glade
 
 
 import dc_glade
 
 

-def test_startup_with_no_data_dir():
+def startup(factory):
+       handle = factory()
+       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
+
+
+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
 
        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:

-               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
+               sys.path.insert(0, "dummy_hildon")
+               startup(dc_glade.Dialcentral)
+               sys.path.remove("dummy_hildon")
+       finally:
+               os.remove(dc_glade.Dialcentral._user_settings)
+               os.removedirs(dc_glade.Dialcentral._data_path)

 
 

-               with test_utils.expected(RuntimeError("Login Failed")):
-                       handle.refresh_session()

 
 

-               handle._save_settings()
+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

 
 

-               del handle
+       try:
+               startup(dc_glade.Dialcentral)

        finally:
                os.remove(dc_glade.Dialcentral._user_settings)
                os.removedirs(dc_glade.Dialcentral._data_path)
        finally:
                os.remove(dc_glade.Dialcentral._user_settings)
                os.removedirs(dc_glade.Dialcentral._data_path)

@@ -43,25 +60,7 @@ def test_startup_with_empty_data_dir():
        dc_glade.Dialcentral._user_settings = "%s/settings.ini" % dc_glade.Dialcentral._data_path
 
        try:
        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
+               startup(dc_glade.Dialcentral)

        finally:
                os.remove(dc_glade.Dialcentral._user_settings)
                os.removedirs(dc_glade.Dialcentral._data_path)
        finally:
                os.remove(dc_glade.Dialcentral._user_settings)
                os.removedirs(dc_glade.Dialcentral._data_path)

@@ -71,20 +70,4 @@ 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
 
        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()
-       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
+       startup(dc_glade.Dialcentral)