Get rid of the distinction between modifiers and expectations.

Tools/Scripts/webkitpy/layout_tests/controllers/manager.py

 # Copyright (C) 2010 Google Inc. All rights reserved.
 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Szeged
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 121 matching lines @@
             should_add_missing_baselines=(self._options.new_test_results and not self._test_is_expected_missing(test_file)))
 
     def _test_requires_lock(self, test_file):
         """Return True if the test needs to be locked when
         running multiple copies of NRWTs. Perf tests are locked
         because heavy load caused by running other tests in parallel
         might cause some of them to timeout."""
         return self._is_http_test(test_file) or self._is_perf_test(test_file)
 
     def _test_is_expected_missing(self, test_file):
-        return (self._expectations.model().has_keyword(test_file, test_expectations.MISSING_KEYWORD)
-            or self._expectations.model().has_keyword(test_file, test_expectations.NEEDS_REBASELINE_KEYWORD)
-            or self._expectations.model().has_keyword(test_file, test_expectations.NEEDS_MANUAL_REBASELINE_KEYWORD))
+        expectations = self._expectations.model().get_expectations(test_file)
+        return test_expectations.MISSING in expectations or test_expectations.NEEDS_REBASELINE in expectations or test_expectations.NEEDS_MANUAL_REBASELINE in expectations

[Dirk Pranke, 2013/07/26 23:07:28]

Nit: Maybe push this into TetsExpectationsLine.is_expected_missing() ?

 
     def _test_is_slow(self, test_file):
-        return self._expectations.has_modifier(test_file, test_expectations.SLOW)
+        return test_expectations.SLOW in self._expectations.model().get_expectations(test_file)

[Dirk Pranke, 2013/07/26 23:07:28]

Nit: maybe push this into TestExpectationsLine.test_is_slow() ?

 
     def needs_servers(self, test_names):
         return any(self._test_requires_lock(test_name) for test_name in test_names)
 
     def _set_up_run(self, test_names):
         self._printer.write_update("Checking build ...")
         if not self._port.check_build(self.needs_servers(test_names)):
             _log.error("Build check failed")
             return False
 
@@ skipping 261 matching lines @@
             return int(worker_name.split('/')[1]) if worker_name else -1
 
         stats = {}
         for result in initial_results.results_by_name.values():
             if result.type != test_expectations.SKIP:
                 stats[result.test_name] = {'results': (_worker_number(result.worker_name), result.test_number, result.pid, int(result.test_run_time * 1000), int(result.total_run_time * 1000))}
         stats_trie = {}
         for name, value in stats.iteritems():
             json_results_generator.add_path_to_trie(name, value, stats_trie)
         return stats_trie