[_SQUASH] correct (sometimes) failing tests

Author: d-w-moore

irods/test/data_obj_test.py

@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 
-from datetime import datetime, timezone
+from datetime import datetime, timezone, timedelta
 import base64
 import collections
 import concurrent.futures
@@ -3308,11 +3308,16 @@ def test_access_time__issue_700(self):
         data_path= iRODSPath(self.coll.path,
             unique_name(my_function_name(), datetime.now())
             )
+
+        time.sleep(2)
+
         with self.sess.data_objects.open(data_path,"w") as f:
             f.write(b'_')
+
+        # At this point, the access_time should be earlier than the modify_time; next we will
+        # test that a read() will the update the access timestamp to be equal or greater.
         with self.sess.data_objects.open(data_path,"r") as f:
             f.read()
-
         data = self.sess.data_objects.get(data_path)
         self.assertGreaterEqual(data.access_time, data.modify_time)
 

irods/test/scripts/test003_write_pam_credentials_to_secrets_file.bats

@@ -43,9 +43,13 @@ except irods.client_init.irodsA_already_exists:
     [ -n "$CONTENTS1" -a "$CONTENTS1" = "$CONTENTS2" ]
 
     # Now delete the already existing irodsA and repeat without negating overwrite.
+    TIMESTAMP_0=$(stat -c%Y $auth_file)
+    sleep 2
     $PYTHON -c "import irods.client_init; irods.client_init.write_pam_irodsA_file('$ALICES_NEW_PAM_PASSWD')"
-    CONTENTS3=$(cat $auth_file)
-    [ "$CONTENTS2" != "$CONTENTS3" ]
+    TIMESTAMP=$(stat -c%Y $auth_file)
+
+    # Test only the timestamp of the new auth_file, not the content, since that is implicitly asserted by the next step.
+    [ $(($TIMESTAMP-TIMESTAMP_0)) -ge 1 ]
 
     # Define the core Python to be run, basically a minimal code block ensuring that we can authenticate to iRODS
     # without an exception being raised.