Upstream version 10.38.222.0

[platform/framework/web/crosswalk.git] / src / tools / swarming_client / googletest / tests / isolate_test_cases_smoke_test.py

diff --git a/src/tools/swarming_client/googletest/tests/isolate_test_cases_smoke_test.py b/src/tools/swarming_client/googletest/tests/isolate_test_cases_smoke_test.py
index 7d6afe1..9dfb0b0 100755 (executable)
--- a/src/tools/swarming_client/googletest/tests/isolate_test_cases_smoke_test.py
+++ b/src/tools/swarming_client/googletest/tests/isolate_test_cases_smoke_test.py
@@ -96,6 +96,7 @@ class IsolateTestCases(unittest.TestCase):
     cmd = [
       sys.executable, 'isolate.py',
       'check',
+      '--config-variable', 'OS', 'amiga',
       '--extra-variable', 'FLAG', 'run',
       '--isolate', os.path.join(self.tempdir, gtest_fake_pass_isolate),
       '--isolated', isolated,
@@ -121,7 +122,6 @@ class IsolateTestCases(unittest.TestCase):
           u's': os.stat(root_dir_gtest_fake_pass_py).st_size,
         },
       },
-      u'os': unicode(isolate.get_flavor()),
       u'relative_cwd': u'isolate_test_cases',
       u'version': unicode(isolate.isolateserver.ISOLATED_FILE_VERSION),
     }
@@ -168,7 +168,7 @@ class IsolateTestCases(unittest.TestCase):
     )
     expected = {
       'conditions': [
-        ['OS=="%s"' % isolate.get_flavor(), {
+        ['OS=="amiga"', {
           'variables': {
             'isolate_dependency_untracked': [
               '../gtest_fake/',
@@ -187,31 +187,22 @@ class IsolateTestCases(unittest.TestCase):
     # you say wow!)
     with open(os.path.join(self.tempdir, gtest_fake_pass_isolate)) as f:
       actual = eval(f.read(), {'__builtins__': None}, None)
-    all_oses = set(['linux', 'mac', 'win'])
-    host_os = isolate.get_flavor()
-    other_oses = all_oses - set([host_os])
     expected = {
-      'conditions': sorted([
-        ['OS=="%s"' % isolate.get_flavor(), {
+      'conditions': [
+        ['OS=="amiga"', {
           'variables': {
             'isolate_dependency_untracked': [
               '../gtest_fake/',
             ],
           },
         }],
-        [' or '.join('OS=="%s"' % os for os in sorted(other_oses)), {
-         'variables': {
-           'isolate_dependency_tracked': [
-             '../gtest_fake/gtest_fake_pass.py',
-            ],
-          },
-        }],
-        [' or '.join('OS=="%s"' % os for os in sorted(all_oses)), {
-         'variables': {
-           'command': ['../gtest_fake/gtest_fake_pass.py'],
-         },
-        }],
-      ]),
+      ],
+      'variables': {
+        'command': ['../gtest_fake/gtest_fake_pass.py'],
+        'isolate_dependency_tracked': [
+          '../gtest_fake/gtest_fake_pass.py',
+        ],
+      },
     }
     self.assertEqual(expected, actual)
 
@@ -219,4 +210,6 @@ class IsolateTestCases(unittest.TestCase):
 if __name__ == '__main__':
   VERBOSE = '-v' in sys.argv
   logging.basicConfig(level=logging.DEBUG if VERBOSE else logging.ERROR)
+  if VERBOSE:
+    unittest.TestCase.maxDiff = None
   unittest.main()