app/test/test_*.py: try ... finally clause.

1 files changed, 42 insertions, 41 deletions

diff --git a/app/test/test_login.py b/app/test/test_login.py
index 88d08f4..40cd638 100644
--- a/app/test/test_login.py
+++ b/app/test/test_login.py
@@ -13,49 +13,50 @@ HOME_PAGE = 'http://121.4.94.30:91/'
 
 
 def test_login():
-    driver.get(HOME_PAGE)
-    driver.save_screenshot('./app/test/test_login_pic0.png')
+    try:
+        driver.get(HOME_PAGE)
+        driver.save_screenshot('./app/test/test_login_pic0.png')
+        
+        assert 'English Pal -' in driver.page_source
     
-    assert 'English Pal -' in driver.page_source
-
-    elem = driver.find_element_by_link_text('成为会员')
-    elem.click()
-
-    uname = ''.join ( [random.choice (string.ascii_letters) for x in range (8)] )
-    elem = driver.find_element_by_name('username')
-    elem.send_keys(uname)
-
-    elem = driver.find_element_by_name('password')
-    elem.send_keys('iamc00l!')
-
-    driver.save_screenshot('./app/test/test_login_pic1.png')
+        elem = driver.find_element_by_link_text('成为会员')
+        elem.click()
     
-    elem = driver.find_element_by_xpath('//form[1]/p[3]/input[1]') # 找到注册按钮
-    elem.click()
-
-    driver.save_screenshot('./app/test/test_login_pic2.png')
+        uname = ''.join ( [random.choice (string.ascii_letters) for x in range (8)] )
+        elem = driver.find_element_by_name('username')
+        elem.send_keys(uname)
     
-    assert '恭喜，你已成功注册' in driver.page_source
-    assert uname in driver.page_source
-
-    # logout
-    driver.get(HOME_PAGE + 'logout')
-    driver.save_screenshot('./app/test/test_login_pic3.png')
+        elem = driver.find_element_by_name('password')
+        elem.send_keys('iamc00l!')
     
-    # login
-    elem = driver.find_element_by_link_text('登录')
-    elem.click()
-
-    elem = driver.find_element_by_name('username')
-    elem.send_keys(uname)
-
-    elem = driver.find_element_by_name('password')
-    elem.send_keys('iamc00l!')
+        driver.save_screenshot('./app/test/test_login_pic1.png')
+        
+        elem = driver.find_element_by_xpath('//form[1]/p[3]/input[1]') # 找到注册按钮
+        elem.click()
     
-    elem = driver.find_element_by_xpath('//form[1]/p[3]/input[1]') # 找到登录按钮
-    elem.click()
-
-    driver.save_screenshot('./app/test/test_login_pic4.png')    
-    assert 'EnglishPal Study Room for ' + uname in  driver.title
-
-    driver.quit()
+        driver.save_screenshot('./app/test/test_login_pic2.png')
+        
+        assert '恭喜，你已成功注册' in driver.page_source
+        assert uname in driver.page_source
+    
+        # logout
+        driver.get(HOME_PAGE + 'logout')
+        driver.save_screenshot('./app/test/test_login_pic3.png')
+        
+        # login
+        elem = driver.find_element_by_link_text('登录')
+        elem.click()
+    
+        elem = driver.find_element_by_name('username')
+        elem.send_keys(uname)
+    
+        elem = driver.find_element_by_name('password')
+        elem.send_keys('iamc00l!')
+        
+        elem = driver.find_element_by_xpath('//form[1]/p[3]/input[1]') # 找到登录按钮
+        elem.click()
+    
+        driver.save_screenshot('./app/test/test_login_pic4.png')    
+        assert 'EnglishPal Study Room for ' + uname in  driver.title
+    finally:
+        driver.quit()