Change typ's interpretation of a test that first fails and is then skipped.

typ/tests/main_test.py

 # Copyright 2014 Dirk Pranke. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #    http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 356 matching lines @@
                                       files=files, ret=0, err='')
         self.assertIn('Retrying failed tests (attempt #1 of 3)', out)
         self.assertNotIn('Retrying failed tests (attempt #2 of 3)', out)
         self.assertIn('1 test run, 0 failures.\n', out)
         results = json.loads(files['full_results.json'])
         self.assertEqual(
             results['tests'][
                 'fail_then_pass_test']['FPTest']['test_count']['actual'],
             'FAIL PASS')
 
+    def test_fail_then_skip(self):
+        files = {'fail_then_skip_test.py': d("""\
+            import unittest
+            count = 0
+            class FPTest(unittest.TestCase):
+                def test_count(self):
+                    global count
+                    count += 1
+                    if count == 1:
+                        self.fail()
+                    elif count == 2:
+                        self.skipTest('')
+            """)}
+        _, out, _, files = self.check(['--retry-limit', '3',
+                                       '--write-full-results-to',
+                                       'full_results.json'],
+                                      files=files, ret=0, err='')
+        self.assertIn('Retrying failed tests (attempt #1 of 3)', out)
+        self.assertNotIn('Retrying failed tests (attempt #2 of 3)', out)
+        self.assertIn('1 test run, 0 failures.\n', out)
+        results = json.loads(files['full_results.json'])
+        self.assertEqual(
+            results['tests'][
+                'fail_then_skip_test']['FPTest']['test_count']['actual'],
+            'FAIL SKIP')
+
     def test_failures_are_not_elided(self):
         _, out, _, _ = self.check(['--terminal-width=20'],
                                   files=FAIL_TEST_FILES, ret=1, err='')
         self.assertIn('[1/1] fail_test.FailingTest.test_fail failed '
                       'unexpectedly:\n', out)
 
     def test_file_list(self):
         files = PASS_TEST_FILES
         self.check(['-f', '-'], files=files, stdin='pass_test\n', ret=0)
         self.check(['-f', '-'], files=files, stdin='pass_test.PassingTest\n',
@@ skipping 288 matching lines @@
                         '--metadata', 'foo=bar'],
                        files=PASS_TEST_FILES, ret=0, err='',
                        out=('[1/1] pass_test.PassingTest.test_pass passed\n'
                             '1 test run, 0 failures.\n'))
 
         finally:
             posts = server.stop()
 
         self.assertEqual(len(posts), 1)
         payload = posts[0][2].decode('utf8')
-        self.assertIn('"test_pass": {"expected": "PASS", "actual": "PASS"}',
+        self.assertIn('"test_pass": {"actual": "PASS", "expected": "PASS"}',
                       payload)
         self.assertTrue(payload.endswith('--\r\n'))
         self.assertNotEqual(server.log.getvalue(), '')
 
     def test_test_results_server_error(self):
         server = test_result_server_fake.start(code=500)
         self.assertNotEqual(server, None, 'could not start fake server')
 
         try:
             self.check(['--test-results-server',
@@ skipping 106 matching lines @@
                     modules_to_unload.append(k)
             for k in modules_to_unload:
                 del sys.modules[k]
             sys.path = orig_sys_path
 
         return ret, out, err
 
     def test_debugger(self):
         # TODO: this test seems to hang under coverage.
         pass