Changeset b030195 in OpenWorkouts-current

Timestamp:

Jan 18, 2019, 2:04:50 PM (5 years ago)

Author:

borja <borja@…>

Branches:

current, feature/docs, master

Children:

d33326a

Parents:

eaef731

Message:

Use the .committed() and ._uncommitted() methods to get the blob file path

for tracking_file and fit_file blobs

Location:

ow

Files:

• models/workout.py (modified) (2 diffs)
• tests/models/test_workout.py (modified) (2 diffs)

ow/models/workout.py

@@ -213 +213 @@
         path = None
         if self.tracking_file:
-            path = self.tracking_file._p_blob_uncommitted
+            path = self.tracking_file._uncommitted()
             if path is None:
-                path = self.tracking_file._p_blob_committed
+                path = self.tracking_file.committed()
         return path
 
@@ -230 +230 @@
         path = None
         if self.fit_file:
-            path = self.fit_file._p_blob_uncommitted
+            path = self.fit_file._uncommitted()
             if path is None:
-                path = self.fit_file._p_blob_committed
+                path = self.fit_file.committed()
         return path
 

ow/tests/models/test_workout.py

@@ -210 +210 @@
         # workout still not saved to the db
         workout.tracking_file = Mock()
-        workout.tracking_file._p_blob_uncommitted = '/tmp/blobtempfile'
-        workout.tracking_file._p_blob_committed = None
+        workout.tracking_file._uncommitted.return_value = '/tmp/blobtempfile'
+        workout.tracking_file.committed.return_value = None
         assert workout.tracking_file_path == '/tmp/blobtempfile'
-        workout.tracking_file._p_blob_uncommitted = None
-        workout.tracking_file._p_blob_committed = '/var/db/blobs/blobfile'
+        workout.tracking_file._uncommitted.return_value = None
+        workout.tracking_file.committed.return_value = '/var/db/blobs/blobfile'
         assert workout.tracking_file_path == '/var/db/blobs/blobfile'
 
@@ -223 +223 @@
         # workout still not saved to the db
         workout.fit_file = Mock()
-        workout.fit_file._p_blob_uncommitted = '/tmp/blobtempfile'
-        workout.fit_file._p_blob_committed = None
+        workout.fit_file._uncommitted.return_value = '/tmp/blobtempfile'
+        workout.fit_file.committed.return_value = None
         assert workout.fit_file_path == '/tmp/blobtempfile'
-        workout.fit_file._p_blob_uncommitted = None
-        workout.fit_file._p_blob_committed = '/var/db/blobs/blobfile'
+        workout.fit_file._uncommitted.return_value = None
+        workout.fit_file.committed.return_value = '/var/db/blobs/blobfile'
         assert workout.fit_file_path == '/var/db/blobs/blobfile'