Merge lp:~kamyanskiy/selenium-simple-test/selenium-grid-on-jenkinds into lp:selenium-simple-test

[Alexander Kamyanskiy]

Fix sst-remote runner, bug #1289990

[lp:~kamyanskiy/selenium-simple-test/selenium-grid-on-jenkinds]

441. By Alexander Kamyanskiy on 2014-11-17

fix misstype iself to self

[Vincent Ladeuil (vila)]

Thanks for working on this !

I think the deeper issue here is that we have no regression tests for that code.

Since this improves the current situation though, we should land this fix anyway and address the testing issue in https://code.launchpad.net/~canonical-platform-qa/selenium-simple-test/fix1394741-remote_browser_init/+merge/242428

review: Approve

[skuli.arnlaugsson (skuli-arnlaugsson)]

Are there any updates to this Pull Request?

I am trying to make Selenium Simple Test work with PhantomJS and this appears to be a problem for that to work. Interested in bumping this.

Unmerged revisions

441. By Alexander Kamyanskiy on 2014-11-17

fix misstype iself to self

440. By Alexander Kamyanskiy on 2014-11-17

add changes to fix sst-remote

=== modified file 'src/sst/browsers.py'
--- src/sst/browsers.py	2013-08-14 13:26:05 +0000
+++ src/sst/browsers.py	2014-11-17 10:39:42 +0000
@@ -69,13 +69,13 @@
 
     webdriver_class = webdriver.Remote
 
-    def __init__(self, capabilities, remote_url):
+    def __init__(self, remote_url, capabilities):
         super(RemoteBrowserFactory, self).__init__()
         self.capabilities = capabilities
         self.remote_url = remote_url
 
     def browser(self):
-        return self.webdriver_class(self.capabilities, self.remote_url)
+        return self.webdriver_class(self.remote_url, self.capabilities)
 
 
 # MISSINGTEST: Exercise this class -- vila 2013-04-11
 
=== modified file 'src/sst/scripts/remote.py'
--- src/sst/scripts/remote.py	2013-08-14 13:26:05 +0000
+++ src/sst/scripts/remote.py	2014-11-17 10:39:42 +0000
@@ -39,16 +39,18 @@
     command.reset_directory(results_directory)
 
     browser_factory = browsers.RemoteBrowserFactory(
+        cmd_opts.webdriver_remote_url,
         {
             "browserName": cmd_opts.browser_type.lower(),
             "platform": cmd_opts.browser_platform.upper(),
             "version": cmd_opts.browser_version,
-            "name": cmd_opts.session_name},
-        cmd_opts.webdriver_remote_url)
+            "name": cmd_opts.session_name
+        }
+    )
     runtests.runtests(
         args, results_directory, sys.stdout,
         test_dir=cmd_opts.dir_name,
-        count_only=cmd_opts.count_only,
+        collect_only=cmd_opts.collect_only,
         report_format=cmd_opts.report_format,
         browser_factory=browser_factory,
         shared_directory=cmd_opts.shared_directory,