45c93a8fe5d76c863b252d8f4f9b37690f584aa2 lrnassar Mon Sep 9 09:44:45 2024 -0700 Forgot to update the way the shell function was being caleld when I updated from python 2.7 which took in a list of variables to python3 with the bash command which just takes in one long string. No RM. diff --git src/utils/qa/imageComp.py src/utils/qa/imageComp.py index 483b1ab..f24ba6a 100755 --- src/utils/qa/imageComp.py +++ src/utils/qa/imageComp.py @@ -93,32 +93,31 @@ noDiffImages.append(image) return(emptyFiles,imagesCompared,differentImages,diffImages,noDiffImages) def reportOutput(emptyFiles,imagesCompared,differentImages,diffImages,noDiffImages,\ diffImagesDir,publicHtmlDirToSave,publicHtmlDirToView,serverUrl1,\ sessionUser1,sessionName1,serverUrl2,sessionUser2,sessionName2): '''Report findings, if differences found create symlinks to public html''' if noDiffImages != []: print("No differences seen in the following session(s):") for image in noDiffImages: print(image) if diffImages != []: print("\nDifferences were observed in the following session(s):") for image in diffImages: print(image) -# run(["ln", "-sf", diffImagesDir+image, publicHtmlDirToSave+image]) - bash(["ln", "-sf", diffImagesDir+image, publicHtmlDirToSave+image]) + bash("ln -sf "+diffImagesDir+image+" "+publicHtmlDirToSave+image) print("Link: "+publicHtmlDirToView+image) print("session 1: %s/cgi-bin/hgTracks?hgS_doOtherUser=submit&hgS_otherUserName=%s&hgS_otherUserSessionName=%s" %(serverUrl1,sessionUser1,sessionName1)) print("session 2: %s/cgi-bin/hgTracks?hgS_doOtherUser=submit&hgS_otherUserName=%s&hgS_otherUserSessionName=%s" %(serverUrl2,sessionUser2,sessionName2)) print("\nNumber of empty session files created: %s" % emptyFiles) print("Total number of images compared: %s" % imagesCompared) print("Different images found: %s" % differentImages) ########### #To be used when extracting all session data #sessionData = run(["hgsql", "-e", "select userName,sessionName from namedSessionDb", "hgcentraltest"], stdout=subprocess.PIPE) ########## def main():