Index: diff_tests.py =================================================================== --- diff_tests.py (revision 14491) +++ diff_tests.py (working copy) @@ -17,7 +17,7 @@ ###################################################################### # General modules -import string, sys, re, os.path +import string, sys, re, os.path, datetime,time # Our testing module import svntest @@ -1771,7 +1771,56 @@ raise svntest.Failure +# Added diff with time option +# Tried to include almost all differing +# time options in the book +def diff_with_time_option(sbox): + "diff with time option" + sbox.build() + wc_dir =sbox.wc_dir + current_dir = os.getcwd() + os.chdir(sbox.wc_dir) + + arg1 = time.strftime('%Y-%m-%d') + arg2 = time.strftime('%H:%M') + arg3 = time.strftime('%Y-%m-%d %H:%M') + arg4 = datetime.datetime.today().isoformat() + arg5 = datetime.datetime.now() + arg6 = time.strftime("%H:%M:%S") + arg7 = time.strftime('%Y%m%dT%H%M') + arg8 = time.strftime('%Y%m%dT%H%M%z') + arg9 = time.strftime('%Y-%m-%dT%H:%M%z') + + #Needed a space in between,could'nt anything better + s = [] + s = time.strftime('%Y-%m-%d %H:%M%z') + s = s[:16] + ' ' + s[16:] + + try: + svntest.actions.run_and_verify_svn(None,None,[], + 'diff', '-r','{'+str(arg1)+'}') + svntest.actions.run_and_verify_svn(None,None,[], + 'diff', '-r','{'+str(arg2)+'}') + svntest.actions.run_and_verify_svn(None,None,[], + 'diff', '-r','{'+str(arg3)+'}') + svntest.actions.run_and_verify_svn(None,None,[], + 'diff', '-r','{'+str(arg4)+'}') + svntest.actions.run_and_verify_svn(None,None,[], + 'diff', '-r','{'+str(arg5)+'}') + svntest.actions.run_and_verify_svn(None,None,[], + 'diff', '-r','{'+str(arg6)+'}') + svntest.actions.run_and_verify_svn(None,None,[], + 'diff', '-r','{'+str(arg7)+'}') + svntest.actions.run_and_verify_svn(None,None,[], + 'diff', '-r','{'+str(arg8)+'}') + svntest.actions.run_and_verify_svn(None,None,[], + 'diff', '-r','{'+str(arg9)+'}') + svntest.actions.run_and_verify_svn(None,None,[], + 'diff', '-r','{'+str(s)+'}') + finally: + os.chdir(current_dir) + ######################################################################## #Run the tests @@ -1803,7 +1852,8 @@ diff_within_renamed_dir, diff_prop_on_named_dir, diff_keywords, - diff_force + diff_force, + diff_with_time_option ] if __name__ == '__main__':