Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(206)

Side by Side Diff: Tools/Scripts/webkitpy/layout_tests/port/base.py

Issue 222153002: Disallow connecting an insecure WebSocket from a secure page. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Update expectation Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (C) 2010 Google Inc. All rights reserved. 1 # Copyright (C) 2010 Google Inc. All rights reserved.
2 # 2 #
3 # Redistribution and use in source and binary forms, with or without 3 # Redistribution and use in source and binary forms, with or without
4 # modification, are permitted provided that the following conditions are 4 # modification, are permitted provided that the following conditions are
5 # met: 5 # met:
6 # 6 #
7 # * Redistributions of source code must retain the above copyright 7 # * Redistributions of source code must retain the above copyright
8 # notice, this list of conditions and the following disclaimer. 8 # notice, this list of conditions and the following disclaimer.
9 # * Redistributions in binary form must reproduce the above 9 # * Redistributions in binary form must reproduce the above
10 # copyright notice, this list of conditions and the following disclaimer 10 # copyright notice, this list of conditions and the following disclaimer
(...skipping 1575 matching lines...) Expand 10 before | Expand all | Expand 10 after
1586 ['--enable-fast-text-autosizing']), 1586 ['--enable-fast-text-autosizing']),
1587 VirtualTestSuite('serviceworker', 1587 VirtualTestSuite('serviceworker',
1588 'http/tests/serviceworker', 1588 'http/tests/serviceworker',
1589 ['--enable-service-worker']), 1589 ['--enable-service-worker']),
1590 VirtualTestSuite('targetedstylerecalc', 1590 VirtualTestSuite('targetedstylerecalc',
1591 'fast/css/invalidation', 1591 'fast/css/invalidation',
1592 ['--enable-targeted-style-recalc']), 1592 ['--enable-targeted-style-recalc']),
1593 VirtualTestSuite('stable', 1593 VirtualTestSuite('stable',
1594 'http/tests/websocket', 1594 'http/tests/websocket',
1595 ['--stable-release-mode']), 1595 ['--stable-release-mode']),
1596 VirtualTestSuite('stable',
1597 'http/tests/security/mixedContent/websocket',
1598 ['--stable-release-mode']),
1596 ] 1599 ]
1597 1600
1598 @memoized 1601 @memoized
1599 def populated_virtual_test_suites(self): 1602 def populated_virtual_test_suites(self):
1600 suites = self.virtual_test_suites() 1603 suites = self.virtual_test_suites()
1601 1604
1602 # Sanity-check the suites to make sure they don't point to other suites. 1605 # Sanity-check the suites to make sure they don't point to other suites.
1603 suite_dirs = [suite.name for suite in suites] 1606 suite_dirs = [suite.name for suite in suites]
1604 for suite in suites: 1607 for suite in suites:
1605 assert suite.base not in suite_dirs 1608 assert suite.base not in suite_dirs
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
1753 if name.find('/') != -1: 1756 if name.find('/') != -1:
1754 _log.error("Virtual test suites names cannot contain /'s: %s" % name) 1757 _log.error("Virtual test suites names cannot contain /'s: %s" % name)
1755 return 1758 return
1756 self.name = 'virtual/' + name + '/' + base 1759 self.name = 'virtual/' + name + '/' + base
1757 self.base = base 1760 self.base = base
1758 self.args = args 1761 self.args = args
1759 self.tests = tests or set() 1762 self.tests = tests or set()
1760 1763
1761 def __repr__(self): 1764 def __repr__(self):
1762 return "VirtualTestSuite('%s', '%s', %s)" % (self.name, self.base, self. args) 1765 return "VirtualTestSuite('%s', '%s', %s)" % (self.name, self.base, self. args)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698