2 new revisions:

Revision: cf509d264796
Branch:   default
Author:   Mika Hänninen <[email protected]>
Date:     Fri May 31 00:05:13 2013
Log:      refactored
http://code.google.com/p/robotframework/source/detail?r=cf509d264796

Revision: ff2323ece6e1
Branch:   default
Author:   Mika Hänninen <[email protected]>
Date:     Fri May 31 00:05:18 2013
Log:      Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=ff2323ece6e1

==============================================================================
Revision: cf509d264796
Branch:   default
Author:   Mika Hänninen <[email protected]>
Date:     Fri May 31 00:05:13 2013
Log:      refactored
http://code.google.com/p/robotframework/source/detail?r=cf509d264796

Modified:
 /atest/robot/cli/nolog/nolog.py

=======================================
--- /atest/robot/cli/nolog/nolog.py     Thu May 30 06:02:11 2013
+++ /atest/robot/cli/nolog/nolog.py     Fri May 31 00:05:13 2013
@@ -1,13 +1,21 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-

-def difference_between_stuff(eka, toka):
-    with open(eka) as content1:
-        with open(toka) as content2:
+def difference_between_stuff(file1, file2):
+    with open(file1) as f1:
+        content1 = f1.readlines()
+        with open(file2) as f2:
+            content2 = f2.readlines()
+            content2.append("sffdfdsdf")
             for l1,l2 in zip(content1, content2):
                 if 'generatedTimestamp' in l1:
                     continue
                 if 'generatedMillis' in l1:
                     continue
                 if l1 != l2:
- raise AssertionError('%r\n is not same as\n%r' % (l1,l2) ) + raise AssertionError('%r\n is not same as\n%r' % (l1, l2))
+            if len(content1) != len(content2):
+                raise AssertionError("file %r len %d is different "
+                                     "than file %r len %d" %
+                                     (file1, len(content1),
+                                      file2, len(content2)))

==============================================================================
Revision: ff2323ece6e1
Branch:   default
Author:   Mika Hänninen <[email protected]>
Date:     Fri May 31 00:05:18 2013
Log:      Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=ff2323ece6e1


--

--- You received this message because you are subscribed to the Google Groups "robotframework-commit" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.


Reply via email to