Changeset 4895 for waeup/trunk/src

Timestamp:

27 Jan 2010, 11:30:00 (15 years ago)

Author:

uli

Message:

Update tests.

File:

• waeup/trunk/src/waeup/utils/batching.txt (modified) (13 diffs)

waeup/trunk/src/waeup/utils/batching.txt

@@ -229 +229 @@
     ...                   ['name', 'dinoports', 'owner', 'taxpayer'],
     ...                    mode='create', user='Bob', logger=logger)
-    (4, 0)
+    (4, 0, '/.../newcomers.finished.csv', None)
 
 The result means: four entries were processed and no warnings
-occured. Let's check:
+occured. Furthermore we get filepath to a CSV file with successfully
+processed entries and a filepath to a CSV file with erraneous entries.
+As everything went well, the latter is ``None``. Let's check:
 
     >>> sorted(stoneville.keys())
@@ -278 +280 @@
     ...                   ['name', 'dinoports', 'owner', 'taxpayer'],
     ...                    mode='create', user='Bob', logger=logger)
-    (4, 4)
+    (4, 4, '/.../newcomers.finished.csv', '/.../newcomers.pending.csv')
+
+This time we also get a path to a .pending file.
 
 The log file will tell us this in more detail:
@@ -291 +295 @@
     Bob: Mode: create
     Bob: User: Bob
-    Bob: Failed datasets: newcomers.create.pending.csv
+    Bob: Failed datasets: newcomers.pending.csv
     Bob: Processing time: ... s (... s/item)
     Bob: Processed: 4 lines (0 successful/ 4 failed)
@@ -299 +303 @@
 process and an additional column with error messages:
 
-    >>> print open('newcomers.create.pending.csv').read()
+    >>> print open('newcomers.pending.csv').read()
     owner,name,taxpayer,dinoports,--ERRORS--
     Barney,Barneys Home,1,2,This object already exists. Skipping.
@@ -322 +326 @@
     >>> processor.doImport('newcomers.csv', ['name', 'dinoports', 'owner'],
     ...                    mode='update', user='Bob')
-    (4, 0)
+    (4, 0, '...', None)
 
 Now we want to tell, that Wilma got an extra port for her second dino:
@@ -339 +343 @@
     >>> processor.doImport('newcomers.csv', ['name', 'dinoports', 'owner'],
     ...                    mode='update', user='Bob')
-    (1, 0)
+    (1, 0, '...', None)
 
     >>> wilma = stoneville['Wilmas Asylum']
@@ -356 +360 @@
     >>> processor.doImport('newcomers.csv', ['name', 'dinoports', 'owner'],
     ...                    mode='update', user='Bob')
-    (1, 1)
+    (1, 1, '/.../newcomers.finished.csv', '/.../newcomers.pending.csv')
     
 Also invalid values will be spotted:
@@ -367 +371 @@
     >>> processor.doImport('newcomers.csv', ['name', 'dinoports', 'owner'],
     ...                    mode='update', user='Bob')
-    (1, 1)
+    (1, 1, '...', '...')
 
 We can also update only some cols, leaving some out. We skip the
@@ -379 +383 @@
     >>> processor.doImport('newcomers.csv', ['name', 'owner'],
     ...                    mode='update', user='Bob')
-    (1, 0)
+    (1, 0, '...', None)
 
     >>> wilma.owner
@@ -410 +414 @@
     >>> processor.doImport('newcomers.csv', ['name', 'dinoports', 'owner'],
     ...                    mode='update', user='Bob')
-    (1, 0)
+    (1, 0, '...', None)
 
     >>> wilma.dinoports is None
@@ -424 +428 @@
     >>> processor.doImport('newcomers.csv', ['name', 'dinoports', 'owner'],
     ...                    mode='update', user='Bob')
-    (1, 0)
+    (1, 0, '...', None)
 
     >>> wilma.dinoports is None
@@ -442 +446 @@
     >>> processor.doImport('newcomers.csv', ['name', 'dinoports', 'owner'],
     ...                    mode='remove', user='Bob')
-    (1, 0)
+    (1, 0, '...', None)
 
     >>> sorted(stoneville.keys())
@@ -454 +458 @@
     >>> import os
     >>> os.unlink('newcomers.csv')
-    >>> os.unlink('newcomers.create.pending.csv')
+    >>> os.unlink('newcomers.finished.csv')
     >>> os.unlink('stoneville.log')