[Pkg-mozext-commits] [requestpolicy] 09/50: [tst][fix] ui harness and requirements.txt

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit d53c123fd3e4fd5ac6bb0730a1b17dc1dc281d03
Author: Martin Kimmerle <dev at 256k.de>
Date:   Mon Mar 28 01:27:45 2016 +0200

    [tst][fix] ui harness and requirements.txt
    
    The packages firefox-puppeteer and firefox-ui-harness are now on
    PyPI and easily usable, because the dependency to
    firefox-ui-tests has now been removed (Bug 1239988).
---
 requirements.txt                            | 11 ++---------
 tests/marionette/rp_ui_harness/runtests.py  |  8 ++++----
 tests/marionette/rp_ui_harness/testcases.py |  2 +-
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 1cfc6e7..f77a318 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,3 @@
--e git+https://github.com/mozilla/firefox-ui-tests.git@76ffb49#egg=firefox-ui-tests
-#-e git+https://github.com/mozilla/firefox-ui-tests.git@python_packages#egg=firefox-puppeteer&subdirectory=firefox_puppeteer
-#-e git+https://github.com/mozilla/firefox-ui-tests.git@python_packages#egg=firefox-ui-harness&subdirectory=firefox_ui_harness
-#-e git+https://github.com/mozilla/firefox-ui-tests.git@python_packages#egg=firefox-ui-tests&subdirectory=firefox_ui_tests
-# Not yet possible because of the firefox-ui-tests dependency.
-# See https://mxr.mozilla.org/mozilla-central/source/testing/firefox-ui/harness/requirements.txt
-# and https://bugzilla.mozilla.org/show_bug.cgi?id=1239988
-#firefox-puppeteer
-#firefox-ui-harness
+firefox-puppeteer
+firefox-ui-harness
 mozrunner >= 6.9
diff --git a/tests/marionette/rp_ui_harness/runtests.py b/tests/marionette/rp_ui_harness/runtests.py
index db8c579..b265b19 100755
--- a/tests/marionette/rp_ui_harness/runtests.py
+++ b/tests/marionette/rp_ui_harness/runtests.py
@@ -4,17 +4,17 @@
 # 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 marionette.runtests import MarionetteHarness, cli as mn_cli
+from marionette.runtests import cli as mn_cli
 
 from firefox_ui_harness.arguments import FirefoxUIArguments
-from firefox_ui_harness.runtests import FirefoxUIHarness
 from rp_ui_harness.runner import RequestPolicyUITestRunner
 
 
-def cli():
+def cli(args=None):
     mn_cli(runner_class=RequestPolicyUITestRunner,
            parser_class=FirefoxUIArguments,
-           harness_class=FirefoxUIHarness)
+           args=args
+           )
 
 if __name__ == '__main__':
     cli()
diff --git a/tests/marionette/rp_ui_harness/testcases.py b/tests/marionette/rp_ui_harness/testcases.py
index 0557283..4fbde89 100644
--- a/tests/marionette/rp_ui_harness/testcases.py
+++ b/tests/marionette/rp_ui_harness/testcases.py
@@ -2,7 +2,7 @@
 # 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_puppeteer.testcases import FirefoxTestCase
+from firefox_ui_harness.testcases import FirefoxTestCase
 from rp_puppeteer import RequestPolicyPuppeteer
 
 from rp_puppeteer.api.error_detection import (LoggingErrorDetection,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git