Merge lp:~canonical-platform-qa/ubuntu-system-tests/make-html5-tests-work-in-dev-env into lp:ubuntu-system-tests

[Sergio Cazzolato]

Make html5 test case work when it is not being executed through adt

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:112
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/239/
Executed test runs:
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-amd64-ci/10/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-armhf-ci/10/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-i386-ci/10/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/239/rebuild

review: Needs Fixing (continuous-integration)

[Federico Gimenez (fgimenez)]

Looks good, apart from the flake8 error and one inline comment

Thanks!

review: Needs Fixing

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:112
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/17/
Executed test runs:
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/39/console
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/40/console
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/44/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/17/rebuild

review: Needs Fixing (continuous-integration)

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:112
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1113/
Executed test runs:
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/364/console
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/362/console
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/1840/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1113/rebuild

review: Needs Fixing (continuous-integration)

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:112
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1151/
Executed test runs:
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/1923/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1151/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

112. By Sergio Cazzolato on 2015-05-22

Make html5 test case work when it is not being executed through adt

=== modified file 'ubuntu_sanity_tests/tests/test_html5_application.py'
--- ubuntu_sanity_tests/tests/test_html5_application.py	2015-03-30 17:04:24 +0000
+++ ubuntu_sanity_tests/tests/test_html5_application.py	2015-05-22 18:42:14 +0000
@@ -120,9 +120,12 @@
 
     :returns: a string containing the chromedriver executable path
     """
-    base_deps_dir = os.path.join(
-        os.path.dirname(os.environ['ADT_ARTIFACTS']),
-        'deps')
+    base_deps_dir = ''
+    adt_artifacts_dir = os.environ.get('ADT_ARTIFACTS', '')
+    if adt_artifacts_dir:
+        base_deps_dir = os.path.join(
+            os.path.dirname(os.environ.get('ADT_ARTIFACTS','')),
+            'deps')
 
     path_glob = '{base_dir}/usr/lib/*/oxide-qt/chromedriver'.format(
         base_dir=base_deps_dir)