Closed Bug 1118697 Opened 9 years ago Closed 9 years ago

Allow server root to be a base URL to an existing webserver

Categories

(Remote Protocol :: Marionette, defect)

defect
Not set
normal

Tracking

(Not tracked)

RESOLVED FIXED
mozilla38

People

(Reporter: davehunt, Assigned: davehunt)

Details

(Keywords: pi-marionette-runner)

Attachments

(1 file, 1 obsolete file)

When we move to an remote device lab we will not be able to access content served by a local webserver. It's likely that we'll have a webserver available in the remote lab, so we need a way to specify the base URL to use.
Attached patch bug1118697.patch (obsolete) — Splinter Review
Attachment #8545186 - Flags: review?(ahalberstadt)
Comment on attachment 8545186 [details] [diff] [review]
bug1118697.patch

Review of attachment 8545186 [details] [diff] [review]:
-----------------------------------------------------------------

::: testing/marionette/client/marionette/runner/base.py
@@ +378,5 @@
>                          action='store',
> +                        help='if omitted, a webserver will be started and will serve content from '
> +                        'Marionette\'s own www resources. If a valid local path is provided then '
> +                        'a webserver will be started serving content from the specified path. Any '
> +                        'other value will be assumed to be a base URL for an existing webserver.')

This seems a bit wordy, maybe something along the lines of:
"A url to a webserver or path to a document root from which "
"content resources are served (default '{}').".format(os.path.join(os.path.dirname(here), 'www'))

@@ +605,5 @@
> +        if self.server_root is None or os.path.isdir(self.server_root):
> +            host = '127.0.0.1'
> +            if need_external_ip:
> +                host = moznetwork.get_ip()
> +            docroot = self.server_root or os.path.join(os.path.dirname(os.path.dirname(__file__)), 'www')

optional nit: personally I like the convention of adding a global:
here = os.path.abspath(os.path.dirname(__file__))
Attachment #8545186 - Flags: review?(ahalberstadt) → review+
Attachment #8548796 - Flags: review?(ahalberstadt) → review+
https://hg.mozilla.org/mozilla-central/rev/8989767ef7f5
Status: ASSIGNED → RESOLVED
Closed: 9 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla38
Product: Testing → Remote Protocol
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: