[llvm-commits] [zorg] r147083 - in /zorg/trunk/lnt: lnt/util/ImportData.py tests/server/db/ImportV4TestSuiteInstance.py

[Daniel Dunbar]

Author: ddunbar
Date: Wed Dec 21 14:00:32 2011
New Revision: 147083

URL: http://llvm.org/viewvc/llvm-project?rev=147083&view=rev
Log:
[lnt/v0.4] lnt import: Update to maintain imported_from field.

Modified:
    zorg/trunk/lnt/lnt/util/ImportData.py
    zorg/trunk/lnt/tests/server/db/ImportV4TestSuiteInstance.py

Modified: zorg/trunk/lnt/lnt/util/ImportData.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/util/ImportData.py?rev=147083&r1=147082&r2=147083&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/util/ImportData.py (original)
+++ zorg/trunk/lnt/lnt/util/ImportData.py Wed Dec 21 14:00:32 2011
@@ -68,6 +68,9 @@
         result['error'] = "import failure: %s" % traceback.format_exc()
         return result
 
+    # If the import succeeded, save the import path.
+    run.imported_from = file
+
     result['import_time'] = time.time() - importStartTime
     if not success:
         # Record the original run this is a duplicate of.

Modified: zorg/trunk/lnt/tests/server/db/ImportV4TestSuiteInstance.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/tests/server/db/ImportV4TestSuiteInstance.py?rev=147083&r1=147082&r2=147083&view=diff
==============================================================================
--- zorg/trunk/lnt/tests/server/db/ImportV4TestSuiteInstance.py (original)
+++ zorg/trunk/lnt/tests/server/db/ImportV4TestSuiteInstance.py Wed Dec 21 14:00:32 2011
@@ -89,9 +89,8 @@
 assert run_b.machine is machine
 assert run_a.order is order_a
 assert run_b.order is order_b
-# FIXME: Set imported_from correctly.
-assert run_a.imported_from is None
-assert run_b.imported_from is None
+assert run_a.imported_from.endswith("sample-a-small.plist")
+assert run_b.imported_from.endswith("sample-b-small.plist")
 assert run_a.start_time == datetime.datetime(2009, 11, 17, 2, 12, 25)
 assert run_a.end_time == datetime.datetime(2009, 11, 17, 3, 44, 48)
 assert not run_a.parameters