Permalink
Browse files

New release.

  • Loading branch information...
1 parent fd23325 commit 263ed352222fdd5431f57f0acf6a7ba4a0af45cf @OniOni committed May 24, 2012
Showing with 4 additions and 9 deletions.
  1. +1 −1 examples/basic-example-json.py
  2. +1 −1 setup.py
  3. +2 −7 wd/parallel.py
@@ -15,7 +15,7 @@ class Selenium2OnSauce(unittest.TestCase):
def setUp(self):
self.drivers = wd.parallel.Remote()
- self.drivers.load_config_file(os.path.join(PATH("myconfig.json")))
+ self.drivers.load_config_file(os.path.join(PATH("config.json")))
@wd.parallel.multiply
View
@@ -11,7 +11,7 @@ def read(fname):
setup(
name = "python-wd-parallel",
packages = ['wd'],
- version = "0.0.3",
+ version = "0.1.0",
author = "Mathieu Sabourin",
author_email = "mathieu.c.sabourin@gmail.com",
maintainer = "Mathieu Sabourin",
View
@@ -56,7 +56,7 @@ def register(self, wd):
except AttributeError as e:
self._drivers = [wd]
- print repr(len(self._drivers)) + ' drivers registered'
+
def multiply(test):
@@ -76,7 +76,6 @@ def thread_func(f, dc=None, ce=None, driver=None, queue=None):
if queue != None:
queue.put(driver)
- print 'Launching test'
f(SubTest(driver))
def wrapper(*args, **kwargs):
@@ -86,13 +85,11 @@ def wrapper(*args, **kwargs):
nb_d = 0
try:
- print repr(len(args[0].drivers._drivers)) + ' drivers.'
for d in args[0].drivers._drivers:
t = multiprocessing.Process(target=thread_func, args=(test,), kwargs={'driver': d})
t.start()
threads += [t]
i += 1
- print "One thread started | " +repr(i)+ " threads running"
except AttributeError:
for c in args[0].drivers._desired_capabilities:
@@ -104,8 +101,7 @@ def wrapper(*args, **kwargs):
t.start()
threads += [t]
i += 1
- print "One thread started | " +repr(i)+ " threads running"
-
+
while nb_d < len(args[0].drivers._desired_capabilities):
driver = queue.get(block=True)
args[0].drivers.register(driver)
@@ -114,7 +110,6 @@ def wrapper(*args, **kwargs):
for t in threads:
t.join()
i -= 1
- print "One thread stopped | " +repr(i)+ " threads running"
# o = SubTest(d)
# test(o)

0 comments on commit 263ed35

Please sign in to comment.