revert recent work for automatic test on ios with saucelab

slapos/recipe/erp5testnode/__init__.py

@@ -58,7 +58,6 @@ class Recipe(GenericBaseRecipe):
           "\npath_list = %s" % ",".join(software_path_list) 
     CONFIG['computer_id'] = self.buildout['slap-connection']['computer-id']
     CONFIG['server_url'] = self.buildout['slap-connection']['server-url']
-    CONFIG['frontend_url'] = self.buildout['testnode-frontend']['connection-secure_access']
     configuration_file = self.createFile(
       self.options['configuration-file'],
       self.substituteTemplate(

slapos/recipe/erp5testnode/template/erp5testnode.cfg.in

@@ -18,7 +18,6 @@ httpd_port = %(httpd_port)s
 httpd_software_access_port = %(httpd_software_access_port)s
 computer_id = %(computer_id)s
 server_url = %(server_url)s
-frontend_url = %(frontend_url)s
 
 # Binaries
 git_binary = %(git_binary)s

slapos/recipe/erp5testnode/template/httpd.conf.in

@@ -77,7 +77,8 @@ SSLProxyEngine On
 Listen [%(ip)s]:%(software_access_port)s
 <VirtualHost *:%(software_access_port)s>
     SSLEngine on
-    DocumentRoot "%(testnode_srv_directory)s"
+    RewriteRule (.*) http://[%(ip)s]:%(software_access_port)s/VirtualHostBase/https/[%(ip)s]:%(software_access_port)s/VirtualHostRoot/$1 [L,P]
+    DocumentRoot "%(testnode_software_directory)s"
     <Directory />
         AllowOverride FileInfo AuthConfig
         Options FollowSymLinks

software/erp5testnode/instance-default.cfg

@@ -16,13 +16,11 @@ parts =
   ca-httpd-testnode
   monitor-base
   monitor-publish
-  testnode-frontend
   
 [monitor-publish]
 recipe = slapos.cookbook:publish
 url = http://[$${shellinabox:ipv6}]:$${shellinabox:port}/
 password = $${pwgen:passwd}
-frontend-url = $${testnode-frontend:connection-secure_access}
 
 [pwgen]
 recipe = slapos.cookbook:generate.password
@@ -162,17 +160,6 @@ software = $${rootdirectory:srv}/software
 shellinabox = $${rootdirectory:srv}/shellinabox
 ca-dir = $${rootdirectory:srv}/ca
 
-[testnode-frontend]
-<= slap-connection
-recipe = slapos.cookbook:requestoptional
-name = Test Node Frontend $${testnode:test-node-title}
-# XXX We have hardcoded SR URL here.
-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-slave = true
-config-url = https://[$${testnode:httpd-ip}]:$${testnode:httpd-software-access-port}
-config-https-only = true
-#software-type = custom-personal
-return = domain secure_access
 
 [slap-parameter]
 node-quantity = 1

software/erp5testnode/software.cfg

@@ -61,7 +61,7 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-default.cfg
 output = ${buildout:directory}/template-default.cfg
 mode = 0644
-md5sum =  8e171816b6caef52ac75c2f8f6a69fc3
+md5sum = 9997ecc39457681aa6f1a161d5670277
 
 [versions]
 PyXML = 0.8.5

software/jstestnode/instance.cfg.in

@@ -2,6 +2,7 @@
 parts =
   nginx-service
   runTestSuite-instance
+
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
@@ -35,7 +36,6 @@ framebuffer = $${:srv}/framebuffer
 recipe = slapos.recipe.template
 url = ${template-runTestSuite:output}
 output = $${directory:bin}/runTestSuite
-buildout-directory = $${buildout:directory}
 mode = 0700
 
 [firefox-instance]
@@ -91,4 +91,4 @@ computer = $${slap_connection:computer_id}
 partition = $${slap_connection:partition_id}
 url = $${slap_connection:server_url}
 key = $${slap_connection:key_file}
-cert = $${slap_connection:cert_file}
+cert = $${slap_connection:cert_file}
\ No newline at end of file

software/jstestnode/runTestSuite.in

@@ -7,7 +7,6 @@
 import argparse, os, re, shutil, subprocess, sys, traceback
 from erp5.util import taskdistribution
 from time import gmtime, strftime
-from lxml import etree
 from selenium import webdriver
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support.ui import WebDriverWait
@@ -31,44 +30,9 @@ def main():
   parser.add_argument('--node_quantity', help='ignored', type=int)
   parser.add_argument('--master_url',
                       help='The Url of Master controling many suites')
-  parser.add_argument('--frontend_url',
-                      help='The url of frontend of the test suite')
-  parser.add_argument('--target',
-                      help='Target OS to run tests on',
-                      type=str)
-  parser.add_argument('--target_version',
-                      help='Target OS version to use',
-                      type=str,)
-  parser.add_argument('--target_browser',
-                      help='The desired browser of the target OS to be used. Example: Firefox if target is Android.',
-                      type=str,)
-  parser.add_argument('--target_device',
-                      help='The desired device running the target OS. Example: iPad Simulator, if target is iOS.',
-                      type=str,)
-  parser.add_argument('--appium_server_auth',
-                      help='Combination of user and token to access SauceLabs service. (i.e. user:token)',
-                      type=str)
 
   args = parser.parse_args()
 
-  import json
-  parsed_parameters = json.loads('$${instance-parameter:configuration._}')
-
-
-  if not getattr(args, 'target', None):
-    args.target = parsed_parameters.get('target', 'firefox')
-  if not getattr(args, 'test_suite', None):
-    args.test_suite = parsed_parameters.get('test-suite')
-  if not getattr(args, 'target_version', None):
-    args.target_version = parsed_parameters.get('target-version')
-  if not getattr(args, 'appium_server_auth', None):
-    args.appium_server_auth = parsed_parameters.get('appium-server-auth')
-  if not getattr(args, 'target_browser', None):
-    args.target_browser = parsed_parameters.get('target-browser')
-  if not getattr(args, 'target_device', None):
-    args.target_device = parsed_parameters.get('target-device')
-
-  is_browser_running = False
   try:
     test_suite_title = args.test_suite_title or args.test_suite
     test_suite = args.test_suite
@@ -83,48 +47,12 @@ def main():
 
     date = strftime("%Y/%m/%d %H:%M:%S", gmtime())
 
-  
     ##########################
     # Run all tests
     ##########################
-    
-    is_appium = False
-    
-    if args.target == 'firefox':
-      firefox_binary = webdriver.firefox.firefox_binary.FirefoxBinary(firefox_path=FIREFOX_EXECUTABLE)
-      browser = webdriver.Firefox(firefox_binary=firefox_binary)
-    elif args.target in ['iOS', 'Android']:
-      # parameters for mobile emulators have different names then parameters for
-      # desktop OSes
-      is_appium = True
-      capabilities = {
-        'platformName': args.target,
-        'platformVersion': args.target_version,
-        'deviceName': args.target_device,
-        'browserName': args.target_browser
+    firefox_binary = webdriver.firefox.firefox_binary.FirefoxBinary(firefox_path=FIREFOX_EXECUTABLE)
+    browser = webdriver.Firefox(firefox_binary=firefox_binary)
 
-      }
-    elif 'Windows' in args.target or 'OS X' in args.target:
-      # parameters for mobile emulators have different names then parameters for
-      # desktop OSes
-      is_appium = True
-      capabilities = {
-        'browserName': args.target_browser,
-        'platform': args.target,
-        'version': args.target_version
-      }
-    if is_appium:
-      if not args.appium_server_auth:
-        raise RuntimeError('--appium_server_auth is required.')
-      appium_url = "http://%s@ondemand.saucelabs.com/wd/hub" % (args.appium_server_auth)
-      browser = webdriver.Remote(appium_url, capabilities)
-
-      # adjust make path to testnode's frontend
-      full_path = '$${runTestSuite-instance:buildout-directory}/software_release/parts/%s' % parsed_parameters['test-url']
-      full_path = full_path.split('srv')[-1]
-      url = "%s%s" % (args.frontend_url, full_path)
-
-    is_browser_running = True
     agent = browser.execute_script("return navigator.userAgent")
     print agent
     print url
@@ -134,47 +62,38 @@ def main():
       By.XPATH, '//p[@id="qunit-testresult" and contains(text(), "completed")]')
     ))
 
-    html_parser = etree.HTMLParser(recover=True)
-    body = etree.fromstring(browser.page_source.encode('UTF-8'), html_parser)
+    browser.title.encode('UTF-8')
+    print browser.find_element_by_id("qunit-testresult").text
 
-    print ' '.join(body.xpath('//*[@id="qunit-testresult"]//text()'))
-
-    for elt in body.xpath('.//ol[@id="qunit-tests"]/li'):
+    for elt in browser.find_elements_by_xpath('//ol[@id="qunit-tests"]/li'):
       test_name = '%s: %s' % (
-        elt.xpath('.//span[@class="module-name"]')[0].text,
-        elt.xpath('.//span[@class="test-name"]')[0].text
+        elt.find_element_by_xpath('.//span[@class="module-name"]').text,
+        elt.find_element_by_xpath('.//span[@class="test-name"]').text
       )
-      print elt.get('class'), ''.join(elt.xpath('.//strong')[0].itertext())
+      print elt.get_attribute('class'), elt.find_element_by_tag_name('strong').text
       # print elt.find_element_by_tag_name('ol').get_attribute('innerHTML')
 
-      failure = int(elt.xpath('.//b[@class="failed"]')[0].text)
-      success = int(elt.xpath('.//b[@class="passed"]')[0].text)
+      failure = int(elt.find_element_by_xpath('.//b[@class="failed"]').text)
+      success = int(elt.find_element_by_xpath('.//b[@class="passed"]').text)
       test_line_dict[test_name] = {
         'test_count': success + failure,
         'error_count': 0,
         'failure_count': failure,
         'skip_count': 0,
-        'duration': int(elt.xpath('.//span[@class="runtime"]')[0].text.split()[0]),
-        'command': elt.xpath('.//a[text()="Rerun"]')[0].get('href'),
+        'duration': int(elt.find_element_by_xpath('.//span[@class="runtime"]').text.split()[0]),
+        'command': elt.find_element_by_xpath('.//a[text()="Rerun"]').get_attribute('href'),
         'stdout': agent,
         'stderr': '',
-        'html_test_result': etree.tostring(elt.xpath('.//ol')[0])
+        'html_test_result': elt.find_element_by_tag_name('ol').get_attribute('innerHTML')
       }
 
-    # do quit browser asap as we have results. this is required in case of timeout of
-    # remote appium service which will close test session of no command received within
-    # usually 90s and thus fail this script. And it costs processing time as well
-    # to keep test session needlessly opened.
-    browser.quit()
-    is_browser_running = False
-
     tool = taskdistribution.TaskDistributionTool(portal_url=args.master_url)
     test_result = tool.createTestResult(revision = revision,
                                         test_name_list = test_line_dict.keys(),
                                         node_title = args.test_node_title,
                                         test_title = test_suite_title,
                                         project_title = args.project_title)
-    if test_result is None or not hasattr(args, 'master_url'):
+    if test_result is None:
       return
     # report test results
     while 1:
@@ -197,12 +116,9 @@ def main():
                   stdout='')
     # XXX: inform test node master of error
     raise EnvironmentError(result)
-  
+
   finally:
-    if is_browser_running:
-      # if by any chance browser is still running due to
-      # traceback raised make sure we cleanup
-      browser.quit()
+    browser.quit()
 
 if __name__ == "__main__":
-    main()
+    main()
\ No newline at end of file

software/jstestnode/software.cfg

@@ -25,7 +25,7 @@ parts =
 
 [instance]
 recipe = slapos.recipe.template
-md5sum = 929a2b6cf6bb16e22e49984563547ca9
+md5sum = 25a9c895fff279b71b0dbbad6647181b
 url = ${:_profile_base_location_}/instance.cfg.in
 output = ${buildout:directory}/instance.cfg
 mode = 0644
@@ -35,7 +35,6 @@ recipe = zc.recipe.egg
 eggs =
   erp5.util
   selenium
-  ${lxml-python:egg}
 interpreter = pythonwitheggs
 
 [renderjs-repository.git]
@@ -107,7 +106,7 @@ mode = 0644
 [template-runTestSuite]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/runTestSuite.in
-md5sum = ef4118cb653838bf5c875c6fcac1677f
+md5sum = 13a56b1b6b2d54dc27ed6570e4b5f1d7
 output = ${buildout:directory}/runTestSuite.in
 mode = 0644