[llvm-commits] [zorg] r110930 - in /zorg/trunk/lnt/tests: DB/Import.py Web/WebSubmit.py

[Daniel Dunbar]

Author: ddunbar
Date: Thu Aug 12 11:04:08 2010
New Revision: 110930

URL: http://llvm.org/viewvc/llvm-project?rev=110930&view=rev
Log:
LNT/tests: Update some tests for import formatting changs.

Modified:
    zorg/trunk/lnt/tests/DB/Import.py
    zorg/trunk/lnt/tests/Web/WebSubmit.py

Modified: zorg/trunk/lnt/tests/DB/Import.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/tests/DB/Import.py?rev=110930&r1=110929&r2=110930&view=diff
==============================================================================
--- zorg/trunk/lnt/tests/DB/Import.py (original)
+++ zorg/trunk/lnt/tests/DB/Import.py Thu Aug 12 11:04:08 2010
@@ -4,27 +4,20 @@
 # RUN: lnt import %t.install %S/Inputs/sample-a-small.plist --commit=1 --show-sample-count |\
 # RUN:   FileCheck -check-prefix=IMPORT-A-1 %s
 
-# IMPORT-A-1: ADDED: 1 machines
-# IMPORT-A-1: ADDED: 1 runs
-# IMPORT-A-1: ADDED: 8 tests
-# IMPORT-A-1: ADDED: 8 samples
+# IMPORT-A-1: Added Machines: 1
+# IMPORT-A-1: Added Runs : 1
+# IMPORT-A-1: Added Tests : 8
+# IMPORT-A-1: Added Samples : 8
 
 # RUN: lnt import %t.install %S/Inputs/sample-b-small.plist --commit=1 --show-sample-count |\
 # RUN:   FileCheck -check-prefix=IMPORT-B %s
 
-# IMPORT-B: ADDED: 0 machines
-# IMPORT-B: ADDED: 1 runs
-# IMPORT-B: ADDED: 0 tests
-# IMPORT-B: ADDED: 8 samples
+# IMPORT-B: Added Runs : 1
 
 # RUN: lnt import %t.install %S/Inputs/sample-a-small.plist --commit=1 --show-sample-count |\
 # RUN:   FileCheck -check-prefix=IMPORT-A-2 %s
 
-# IMPORT-A-2: IGNORING DUPLICATE RUN
-# IMPORT-A-2: ADDED: 0 machines
-# IMPORT-A-2: ADDED: 0 runs
-# IMPORT-A-2: ADDED: 0 tests
-# IMPORT-A-2: ADDED: 0 samples
+# IMPORT-A-2: This submission is a duplicate of run 1
 
 # RUN: python %s %t.install/data/lnt.db
 

Modified: zorg/trunk/lnt/tests/Web/WebSubmit.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/tests/Web/WebSubmit.py?rev=110930&r1=110929&r2=110930&view=diff
==============================================================================
--- zorg/trunk/lnt/tests/Web/WebSubmit.py (original)
+++ zorg/trunk/lnt/tests/Web/WebSubmit.py Thu Aug 12 11:04:08 2010
@@ -1,18 +1,5 @@
 # RUN: lnt submit %base_url/submitRun %S/../DB/Inputs/sample-a-small.plist > %t
 # RUN: FileCheck %s < %t
 
-# CHECK: STATUS: 0
-
-# CHECK: OUTPUT:
-# CHECK: IMPORT: {{.*}}/lnt_tmp/{{.*}}.plist
-# CHECK: LOAD TIME: {{.*}}
-# CHECK: IMPORT TIME: {{.*}}
-# CHECK: MACHINE: {{.*}}
-# CHECK: START  : {{.*}}
-# CHECK: END    : {{.*}}
-# CHECK: INFO   : u'tag' = u'nightlytest'
-# CHECK: MAILING RESULTS TO: {{.*}}
-# CHECK: ADDED: {{[0-9]*}} machines
-# CHECK: ADDED: {{[0-9]*}} runs
-# CHECK: ADDED: {{[0-9]*}} tests
-# CHECK: DISCARDING RESULT: DONE
+# CHECK: Importing u'{{.*}}.plist'
+# CHECK: Import succeeded.