875527 - port permissions.py change from bug 688667

Status: RESOLVED FIXED

(Testing :: Mozbase, defect)

Description

[Jeff Hammel]

The one line permissions.py change should be ported from the patch:

--- a/testing/mozbase/mozprofile/mozprofile/permissions.py   Thu May
    23 10:31:56 2013 -0400
+++ b/testing/mozbase/mozprofile/mozprofile/permissions.py      Thu
    May 23 13:41:57 2013 -0400
@@ -24,7 +24,7 @@
 #
    http://hg.mozilla.org/mozilla-central/file/b871dfb2186f/build/automation.py.in#l28
 _DEFAULT_PORTS = { 'http': '8888',
                    'https': '4443',
-                   'ws': '9988',
+                   'ws': '4443',
                    'wss': '4443' }
 
 class LocationError(Exception):

mozprofile should be bumped and mirrored to m-c, potentially as part
of bug 872285 (or not, as fitting)

Comment 1

[Jeff Hammel]

Attachment: port fix

Unfortunately, this causes a test error:

======================================================================
FAIL: test_nw_prefs (permissions.PermissionsTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/jhammel/mozbase/src/mozbase/mozprofile/tests/permissions.py", line 147, in test_nw_prefs
    self.assertTrue(all(c in user_prefs[1][1] for c in proxy_check))
AssertionError: False is not true

----------------------------------------------------------------------
Ran 116 tests in 125.430s

FAILED (failures=1)

I'll look into this

Comment 2

[Jeff Hammel]

Attachment: port fix + fix test

fortunately trivial test fix

Comment 3

[Jeff Hammel]

pushed: https://github.com/mozilla/mozbase/commit/2bdfc0e23cf59855f9ef6d79516f24198f4bbdfa

This still needs to be mirrored; will be done as part of bug 872285, but if needed before please file a follow up