| OLD | NEW |
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 import collections | 4 import collections |
| 5 import itertools | 5 import itertools |
| 6 import os | 6 import os |
| 7 import unittest | 7 import unittest |
| 8 | 8 |
| 9 from telemetry.testing import fakes | 9 from telemetry.testing import fakes |
| 10 | 10 |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 len(c1.vendors) + len(c1.devices) == 0 or \ | 136 len(c1.vendors) + len(c1.devices) == 0 or \ |
| 137 len(c2.vendors) + len(c2.devices) == 0 or \ | 137 len(c2.vendors) + len(c2.devices) == 0 or \ |
| 138 len(c1.vendors.intersection(c2.vendors)) != 0 or \ | 138 len(c1.vendors.intersection(c2.vendors)) != 0 or \ |
| 139 len(c1.devices.intersection(c2.devices)) != 0 or \ | 139 len(c1.devices.intersection(c2.devices)) != 0 or \ |
| 140 any([vendor in c1.vendors for (vendor, _) in c2.devices]) or \ | 140 any([vendor in c1.vendors for (vendor, _) in c2.devices]) or \ |
| 141 any([vendor in c2.vendors for (vendor, _) in c1.devices]) | 141 any([vendor in c2.vendors for (vendor, _) in c1.devices]) |
| 142 | 142 |
| 143 conflicts = non_gpu_conflicts and gpu_conflicts | 143 conflicts = non_gpu_conflicts and gpu_conflicts |
| 144 | 144 |
| 145 if conflicts: | 145 if conflicts: |
| 146 print "WARNING: Found a conflict for", pattern | 146 print "WARNING: Found a conflict for", pattern, " :" |
| 147 print " ", c1 |
| 148 print " ", c2 |
| 149 |
| 150 print " Type:" + (" (non-gpu)" if non_gpu_conflicts else "") + \ |
| 151 (" (gpu)" if gpu_conflicts else "") |
| 147 self.assertEquals(conflicts, False) | 152 self.assertEquals(conflicts, False) |
| OLD | NEW |