| OLD | NEW |
| 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 12 matching lines...) Expand all Loading... |
| 23 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 23 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 24 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 24 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 25 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 25 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 28 | 28 |
| 29 import logging | 29 import logging |
| 30 import optparse | 30 import optparse |
| 31 import sys | 31 import sys |
| 32 import tempfile | 32 import tempfile |
| 33 import webkitpy.thirdparty.unittest2 as unittest | 33 import unittest |
| 34 | 34 |
| 35 from webkitpy.common.system.executive import Executive, ScriptError | 35 from webkitpy.common.system.executive import Executive, ScriptError |
| 36 from webkitpy.common.system import executive_mock | 36 from webkitpy.common.system import executive_mock |
| 37 from webkitpy.common.system.filesystem_mock import MockFileSystem | 37 from webkitpy.common.system.filesystem_mock import MockFileSystem |
| 38 from webkitpy.common.system.outputcapture import OutputCapture | 38 from webkitpy.common.system.outputcapture import OutputCapture |
| 39 from webkitpy.common.system.path import abspath_to_uri | 39 from webkitpy.common.system.path import abspath_to_uri |
| 40 from webkitpy.thirdparty.mock import Mock | 40 from webkitpy.thirdparty.mock import Mock |
| 41 from webkitpy.tool.mocktool import MockOptions | 41 from webkitpy.tool.mocktool import MockOptions |
| 42 from webkitpy.common.system.executive_mock import MockExecutive, MockExecutive2 | 42 from webkitpy.common.system.executive_mock import MockExecutive, MockExecutive2 |
| 43 from webkitpy.common.system.systemhost_mock import MockSystemHost | 43 from webkitpy.common.system.systemhost_mock import MockSystemHost |
| (...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 461 suite = VirtualTestSuite('suite/bar', 'base/foo', ['--args']) | 461 suite = VirtualTestSuite('suite/bar', 'base/foo', ['--args']) |
| 462 self.assertFalse(hasattr(suite, 'name')) | 462 self.assertFalse(hasattr(suite, 'name')) |
| 463 self.assertFalse(hasattr(suite, 'base')) | 463 self.assertFalse(hasattr(suite, 'base')) |
| 464 self.assertFalse(hasattr(suite, 'args')) | 464 self.assertFalse(hasattr(suite, 'args')) |
| 465 | 465 |
| 466 def test_legacy(self): | 466 def test_legacy(self): |
| 467 suite = VirtualTestSuite('suite/bar', 'base/foo', ['--args'], use_legacy
_naming=True) | 467 suite = VirtualTestSuite('suite/bar', 'base/foo', ['--args'], use_legacy
_naming=True) |
| 468 self.assertEqual(suite.name, 'virtual/suite/bar') | 468 self.assertEqual(suite.name, 'virtual/suite/bar') |
| 469 self.assertEqual(suite.base, 'base/foo') | 469 self.assertEqual(suite.base, 'base/foo') |
| 470 self.assertEqual(suite.args, ['--args']) | 470 self.assertEqual(suite.args, ['--args']) |
| OLD | NEW |