Handle tries of results data in upload (fix _is_directory).

Tools/TestResultServer/model/jsonresults.py

 # Copyright (C) 2010 Google Inc. All rights reserved.
 #
 # 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
 # copyright notice, this list of conditions and the following disclaimer
 # in the documentation and/or other materials provided with the
 # distribution.
 #     * Neither the name of Google Inc. nor the names of its
 # contributors may be used to endorse or promote products derived from
 # this software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import collections
 import json
 import logging
 import re
 import sys
 import traceback
 
 from testfile import TestFile
 
 JSON_RESULTS_FILE = "results.json"
 JSON_RESULTS_FILE_SMALL = "results-small.json"
@@ skipping 64 matching lines @@
     SKIP_STRING: SKIP,
     TEXT_STRING: TEXT,
     TIMEOUT_STRING: TIMEOUT,
     LEAK_STRING: LEAK,
 }
 
 # FIXME: Use dict comprehensions once we update the server to python 2.7.
 CHAR_TO_FAILURE = dict((value, key) for key, value in FAILURE_TO_CHAR.items())
 
 def _is_directory(subtree):
-    return RESULTS_KEY not in subtree
+    return RESULTS_KEY not in subtree or not isinstance(subtree[RESULTS_KEY], collections.Sequence)
 
 
 class JsonResults(object):
     @staticmethod
     def is_aggregate_file(name):
         return name in (JSON_RESULTS_FILE, JSON_RESULTS_FILE_SMALL)
 
     @classmethod
     def _strip_prefix_suffix(cls, data):
         if data.startswith(JSON_RESULTS_PREFIX) and data.endswith(JSON_RESULTS_SUFFIX):
@@ skipping 399 matching lines @@
 
         check_json_error_string = cls._check_json(builder, json)
         if check_json_error_string:
             return None
 
         test_list_json = {}
         tests = json[builder][TESTS_KEY]
         cls._delete_results_and_times(tests)
         test_list_json[builder] = {TESTS_KEY: tests}
         return cls._generate_file_data(test_list_json)