From 973aaa59156d45894ed6c4cde3684b746f6c3d62 Mon Sep 17 00:00:00 2001
From: Armen Zambrano <armenzg@users.noreply.github.com>
Date: Tue, 8 Sep 2015 15:54:37 -0400
Subject: [PATCH] Merge pull request #233 from armenzg/origin/python_script

Bug 1201668 - Allow running Firefox UI update tests through a python wrapper script. r=whimboo
(cherry picked from commit 310ff2d40229aac20a346a8597dda42dd7f225be)
---
 firefox_ui_harness/__init__.py   |  5 ++---
 firefox_ui_harness/cli_update.py | 15 +++++++++++++++
 firefox_ui_harness/runtests.py   | 13 ++-----------
 setup.py                         |  2 +-
 4 files changed, 20 insertions(+), 15 deletions(-)
 create mode 100644 firefox_ui_harness/cli_update.py

diff --git a/firefox_ui_harness/__init__.py b/firefox_ui_harness/__init__.py
index 546844bf..e3f5483f 100644
--- a/firefox_ui_harness/__init__.py
+++ b/firefox_ui_harness/__init__.py
@@ -2,9 +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 runtests import (cli,
-                      cli_update,
-                      )
+from cli_update import cli_update
+from runtests import cli
 
 from testcases import (FirefoxTestCase,
                        UpdateTestCase,
diff --git a/firefox_ui_harness/cli_update.py b/firefox_ui_harness/cli_update.py
new file mode 100644
index 00000000..bb07a0c2
--- /dev/null
+++ b/firefox_ui_harness/cli_update.py
@@ -0,0 +1,15 @@
+# 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.arguments import UpdateArguments
+from firefox_ui_harness.runners import UpdateTestRunner
+from firefox_ui_harness.runtests import cli
+
+
+def cli_update():
+    cli(runner_class=UpdateTestRunner, parser_class=UpdateArguments)
+
+
+if __name__ == '__main__':
+    cli_update()
diff --git a/firefox_ui_harness/runtests.py b/firefox_ui_harness/runtests.py
index f2498f42..98aba5ec 100644
--- a/firefox_ui_harness/runtests.py
+++ b/firefox_ui_harness/runtests.py
@@ -10,13 +10,8 @@
 
 from mozlog import structured
 
-from firefox_ui_harness.arguments import (FirefoxUIArguments,
-                                          UpdateArguments,
-                                          )
-
-from firefox_ui_harness.runners import (FirefoxUITestRunner,
-                                        UpdateTestRunner,
-                                        )
+from firefox_ui_harness.arguments import FirefoxUIArguments
+from firefox_ui_harness.runners import FirefoxUITestRunner
 
 
 def startTestRunner(runner_class, options, tests):
@@ -78,9 +73,5 @@ def cli(runner_class=FirefoxUITestRunner, parser_class=FirefoxUIArguments):
         sys.exit(1)
 
 
-def cli_update():
-    cli(runner_class=UpdateTestRunner, parser_class=UpdateArguments)
-
-
 if __name__ == '__main__':
     sys.exit(cli())
diff --git a/setup.py b/setup.py
index 37769239..ddaa247d 100644
--- a/setup.py
+++ b/setup.py
@@ -39,5 +39,5 @@
       entry_points="""
         [console_scripts]
         firefox-ui-tests = firefox_ui_harness:cli
-        firefox-ui-update = firefox_ui_harness:cli_update
+        firefox-ui-update = firefox_ui_harness.cli_update:cli_update
       """)