Remove timestamp argument from command line.

The timestamp command-line argument is obsolete
(and has probably always been!), so it is removed.

Ordering is currently based on the assumption that
results are uploaded in the order the associated
SHA-1s occur in the branch. In other words: once
results for a given SHA-1 are uploaded, it is
assummed that results for older SHA-1s will not
be uploaded.

Should this become too restrictive at
some point, we can let the server figure out the
SHA-1 ordering (e.g. by analyzing a local repository
clone of the branch in question). The client would
still only pass the SHA-1 itself.

1 files changed, 5 insertions, 17 deletions

diff --git a/scripts/uploadresults.py b/scripts/uploadresults.py
index faa3581..e26ec1a 100755
--- a/scripts/uploadresults.py
+++ b/scripts/uploadresults.py
@@ -11,10 +11,9 @@ from misc import isValidSHA1, getContext
 def printUsage():
     print (
         "usage:" + sys.argv[0] +
-        " --help | <host> <platform> <branch> <SHA-1> <timestamp> " +
-        "<XML file> <database>")
+        " --help | <host> <platform> <branch> <SHA-1> <XML file> <database>")
 
-def printVerboseUsage():
+def printVerboseUsagebbbbq():
     printUsage()
     print ("<host>:      The physical machine on which the results were " +
            "produced (e.g. barbarella or 172.24.90.79).")
@@ -25,8 +24,6 @@ def printVerboseUsage():
     print ("<SHA-1>:     The tested revision within the branch. Can be " +
            "extracted using 'git log -1 --pretty=format:%H' (assuming the " +
            "tested revision is the current head revision).")
-    print ("<timestamp>: The commit timestamp of the tested revision. " +
-           "Can be extracted using 'git show -s --pretty=format:%ct <SHA-1>'.")
     print ("<XML file>:  The results file (QTestLib output format).")
     print (
         "<database>:  The database. One of 'bm' or 'bm-dev' (the latter " +
@@ -190,7 +187,7 @@ if ((len(sys.argv) > 1) and (sys.argv[1] == "--help")):
     printVerboseUsage()
     sys.exit(1)
 
-if (len(sys.argv) != 8):
+if (len(sys.argv) != 7):
     printUsage()
     sys.exit(1)
 
@@ -201,17 +198,8 @@ sha1      = sys.argv[4]
 if (not isValidSHA1(sha1)):
     print "invalid SHA-1:", sha1
     sys.exit(1)
-
-timestamp = sys.argv[5]
-try:
-    if (timestamp != str(int(timestamp))):
-        raise
-except:
-    print "timestamp not an integer:", timestamp
-    sys.exit(1)
-
-xmlFile = sys.argv[6]
-db      = sys.argv[7]
+xmlFile = sys.argv[5]
+db      = sys.argv[6]
 
 # Perform a basic validation of the other arguments as well ... 2 B DONE!