fix phone tests

Author: dannyroberts

corehq/ex-submodules/casexml/apps/phone/caselogic.py

@@ -156,6 +156,7 @@ def get_case_updates(user, last_sync):
     """
     return CaseSyncOperation(user, last_sync)
 
+
 def filter_cases_modified_elsewhere_since_sync(cases, last_sync):
     # this function is pretty ugly and is heavily optimized to reduce the number
     # of queries to couch.
@@ -187,9 +188,15 @@ def filter_cases_modified_elsewhere_since_sync(cases, last_sync):
             #   'value': '2012-08-22T08:55:14Z', (most recent date updated)
             #   'key': ['[case id]', '[sync token id]']
             # }
-            if row['value']:
+            dt_string = row['value']
+            if dt_string:
+                try:
+                    dt = datetime.strptime(dt_string, '%Y-%m-%dT%H:%M:%SZ')
+                except ValueError as e:
+                    assert 'does not match format' in unicode(e)
+                    dt = datetime.strptime(dt_string, '%Y-%m-%dT%H:%M:%S.%f')
                 all_case_updates_by_sync_token[row['key'][0]].append(
-                    {'token': row['key'][1], 'date': datetime.strptime(row['value'], '%Y-%m-%dT%H:%M:%SZ')}
+                    {'token': row['key'][1], 'date': dt}
                 )
 
         def case_modified_elsewhere_since_sync(case):

corehq/ex-submodules/casexml/apps/phone/models.py

@@ -1,7 +1,6 @@
 from copy import copy
 from couchdbkit.exceptions import ResourceConflict, ResourceNotFound
 from couchdbkit.ext.django.schema import *
-from dimagi.utils.couch.database import SafeSaveDocument
 from dimagi.utils.mixins import UnicodeMixIn
 from dimagi.utils.couch import LooselyEqualDocumentSchema
 from casexml.apps.case import const
@@ -10,8 +9,14 @@
 import logging
 
 
+from corehq.ext.couchdbkit import (
+    UTCDateTimeProperty as DateTimeProperty,
+    ISOSafeSaveDocument as SafeSaveDocument,
+)
+
+
 class User(object):
-    """ 
+    """
     This is a basic user model that's used for OTA restore to properly
     find cases and generate the user XML.
     """

corehq/ex-submodules/casexml/apps/phone/tests/test_ota_restore.py

@@ -197,7 +197,7 @@ def testWithReferrals(self):
        <request_name>ME</request_name>
        <request_rank>staff_nurse</request_rank>
        <request_reason></request_reason>
-       <request_timestamp>2011-02-19 16:46:28</request_timestamp>
+       <request_timestamp>2011-02-19 16:46:28.975000</request_timestamp>
        <ringing></ringing>
        <seizures></seizures>
        <short_name>SIEGEL, ROBERT</short_name>
@@ -275,7 +275,7 @@ def testWithReferrals(self):
        <request_name>ME</request_name>
        <request_rank>staff_nurse</request_rank>
        <request_reason></request_reason>
-       <request_timestamp>2011-02-19 16:46:28</request_timestamp>
+       <request_timestamp>2011-02-19 16:46:28.975000</request_timestamp>
        <ringing></ringing>
        <seizures></seizures>
        <short_name>SIEGEL, ROBERT</short_name>