From bb8b2bcdbf7c8818282b5ab2fed84df5c99e440a Mon Sep 17 00:00:00 2001 From: Richard Wallis Date: Thu, 2 Jan 2020 12:55:06 +0000 Subject: [PATCH] Added test to identify duplicate entries in jsonldcontext file (#2378) * Added option to output to stdout * Added call to check for duplicates in jsonldcontext output * Tweak Co-authored-by: Richard Wallis --- scripts/buildarchivecontext.py | 13 +++++++++---- scripts/run_tests.py | 10 ++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/scripts/buildarchivecontext.py b/scripts/buildarchivecontext.py index 9a710d1a34..105bdc622e 100755 --- a/scripts/buildarchivecontext.py +++ b/scripts/buildarchivecontext.py @@ -53,9 +53,14 @@ ret = GetJsonLdContext(layers=ALL_LAYERS) -fname = "%s/%s" % (args.outputDirectory,args.output) -print("Writing context to: %s" % fname) -file = open(fname, "w") +f = args.output +if f == "-": + file = sys.stdout +else: + fname = "%s/%s" % (args.outputDirectory,f) + print("Writing context to: %s" % fname) + file = open(fname, "w") file.write(ret) -file.close() +if file is not sys.stdout: + file.close() diff --git a/scripts/run_tests.py b/scripts/run_tests.py index 2900653dc8..60a9fc3a30 100755 --- a/scripts/run_tests.py +++ b/scripts/run_tests.py @@ -91,7 +91,17 @@ def main(test_path, args): # Discover and run tests. #suite = unittest.loader.TestLoader().discover(test_path) #unittest.TextTestRunner(verbosity=2).run(suite) + + import subprocess + contextCheck = "./scripts/buildarchivecontext.py -o -|cut -d'\"' -f2|sort|uniq -d" + print "Checking jsonldcontext for duplicates" + dups = subprocess.check_output(contextCheck,shell=True) + if len(dups): + print "Duplicate entries in jsonldcontext: %s" % dups + sys.exit(1) + print "No duplicates in jsonldcontext\n\n" + if vars(args)["skipbasics"]: suite = unittest.loader.TestLoader().discover(test_path, pattern="*graphs*.py") else: