Merge "Cleanup unused states"

taskflow/states.py

@@ -26,24 +26,19 @@ UNCLAIMED = 'UNCLAIMED'
 
 # Flow states.
 FAILURE = FAILURE
-INTERRUPTED = 'INTERRUPTED'
 PENDING = 'PENDING'
-RESUMING = 'RESUMING'
 REVERTING = 'REVERTING'
 REVERTED = 'REVERTED'
 RUNNING = RUNNING
-STARTED = 'STARTED'
 SUCCESS = SUCCESS
-CANCELLED = 'CANCELLED'
-INCOMPLETE = 'INCOMPLETE'
 SUSPENDING = 'SUSPENDING'
 SUSPENDED = 'SUSPENDED'
 
 # Task states.
 FAILURE = FAILURE
-STARTED = STARTED
 SUCCESS = SUCCESS
-TIMED_OUT = 'TIMED_OUT'
-CANCELLED = CANCELLED
 REVERTED = REVERTED
 REVERTING = REVERTING
+
+# TODO(harlowja): use when we can timeout tasks??
+TIMED_OUT = 'TIMED_OUT'

taskflow/tests/unit/test_storage.py

@@ -176,11 +176,11 @@ class StorageTest(test.TestCase):
 
     def test_get_flow_state(self):
         lb, fd = p_utils.temporary_flow_detail(backend=self.backend)
-        fd.state = states.INTERRUPTED
+        fd.state = states.FAILURE
         with contextlib.closing(self.backend.get_connection()) as conn:
             fd.update(conn.update_flow_details(fd))
         s = storage.Storage(flow_detail=fd, backend=self.backend)
-        self.assertEquals(s.get_flow_state(), states.INTERRUPTED)
+        self.assertEquals(s.get_flow_state(), states.FAILURE)
 
     def test_set_and_get_flow_state(self):
         s = self._get_storage()