Bug 1234345 - Add cli_functional.py script to firefox_ui_harness for …

…backward compatibility. r=maja_zf

(cherry picked from commit 46f0ab9)

.travis.yml

@@ -39,10 +39,10 @@ before_script:
 
 script:
     # Run in non-e10s mode
-    - firefox-ui-tests --installer *firefox-* --gecko-log -
+    - firefox-ui-functional --installer *firefox-* --gecko-log -
 
     # Run in e10s mode
-    - firefox-ui-tests --installer *firefox-* --gecko-log - --e10s
+    - firefox-ui-functional --installer *firefox-* --gecko-log - --e10s
 
 notifications:
     irc:

firefox_ui_harness/__init__.py

@@ -2,8 +2,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from cli_update import cli_update
-from runtests import cli
+import cli_functional
+import cli_update
 
 from testcases import (FirefoxTestCase,
                        UpdateTestCase,

firefox_ui_harness/cli_functional.py

@@ -0,0 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from firefox_ui_harness.runtests import cli as cli_functional
+
+
+if __name__ == '__main__':
+    cli_functional()

setup.py

@@ -39,5 +39,6 @@
       entry_points="""
         [console_scripts]
         firefox-ui-tests = firefox_ui_harness:cli
+        firefox-ui-functional = firefox_ui_harness.cli_functional:cli_functional
         firefox-ui-update = firefox_ui_harness.cli_update:cli_update
       """)