some changes

d1ffuz0r · Aug 13, 2012 · 2a86b85 · 2a86b85
1 parent 664b1b2
commit 2a86b85
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/pool.py b/pool.py
@@ -22,22 +22,18 @@ def stop(self):
         for name, browser in self.browsers.items():
             try:
                 browser.quit()
-            except:
-                pass
             finally:
                 del self.result[name]
 
     def action(self, action, arg=None):
         for name, browser in self.browsers.items():
             try:
-                if not self.result[name]:
+                if not self.result[name] or action.startswith('find_'):
                     self.result[name] = getattr(browser, action)(arg)
                 elif not arg:
                     self.result[name] = getattr(self.result[name], action)()
                 elif action in self.ignored:
                     getattr(self.result[name], action)(arg)
-                elif action.startswith('find_'):
-                    self.result[name] = getattr(browser, action)(arg)
                 else:
                     self.result[name] = getattr(self.result[name], action)(arg)
             except:

diff --git a/tests.py b/tests.py
@@ -1,9 +1,12 @@
 #!/usr/bin/env python
 import unittest
 import threading
+
 from pool import WebPool
+
 from selenium import webdriver
 from selenium.webdriver.remote.webelement import WebElement
+from selenium.webdriver.firefox.firefox_profile import FirefoxProfile
 
 
 def check(result=None, assertion=None, act=None, arg=None):
@@ -27,7 +30,8 @@ class Tests(unittest.TestCase):
     def setUpClass(cls):
         cls.pool = WebPool()
         cls.brs = {'chrome': webdriver.Chrome,
-                   'chrome1': webdriver.Chrome}
+                   'chrome1': webdriver.Chrome,
+                   'chrome2': webdriver.Chrome}
         cls.pool.browsers = cls.brs
         cls.pool.action('implicitly_wait', 40)
 
@@ -93,11 +97,12 @@ def test_empty(self):
     def test_start(self):
         self.pool.start()
         brs = {'chrome': webdriver.Chrome,
-               'chrome1': webdriver.Chrome}
+               'chrome1': webdriver.Chrome,
+               'chrome2': webdriver.Chrome}
         self.pool.browsers = brs
-        self.assertEquals(self.pool.browsers.keys(), ['chrome', 'chrome1'])
+        self.assertEquals(self.pool.browsers.keys(), ['chrome', 'chrome1', 'chrome2'])
         self.pool.start()
-        self.assertEquals(self.pool.result.keys(), ['chrome', 'chrome1'])
+        self.assertEquals(self.pool.result.keys(), ['chrome', 'chrome1', 'chrome2'])
         self.pool.stop()
         self.assertDictEqual(self.pool.result, {})