dolfin team mailing list archive

[Anders Logg <logg@xxxxxxxxx>]

It happens now and then that even though I have changed nothing in my
local branch and I pull something from the main branch (in this case a
changeset by Johannes) that I need to commit (bzr diff is not empty).

Anyone knows why?

--
Anders

--- Begin Message ---

• To: Anders Logg <logg@xxxxxxxxx>
• From: noreply@xxxxxxxxxxxxx
• Date: Wed, 09 Mar 2011 21:29:33 -0000
• Authentication-results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@xxxxxxxxxxxxx designates 91.189.90.139 as permitted sender) smtp.mail=bounces@xxxxxxxxxxxxx
• Delivered-to: logg@xxxxxxxxx
• Reply-to: noreply@xxxxxxxxxxxxx
• Sender: bounces@xxxxxxxxxxxxx

Merge authors:
  Johannes Ring (johannr)
------------------------------------------------------------
revno: 5733 [merge]
committer: Anders Logg <logg@xxxxxxxxx>
branch nick: dolfin
timestamp: Wed 2011-03-09 22:27:21 +0100
message:
  merge
modified:
  test/system/parallel-assembly-solve/test.py
  test/system/test.py


--
lp:~dolfin-core/dolfin/logg
https://code.launchpad.net/~dolfin-core/dolfin/logg

You are subscribed to branch lp:~dolfin-core/dolfin/logg.
To unsubscribe from this branch go to https://code.launchpad.net/~dolfin-core/dolfin/logg/+edit-subscription

=== modified file 'test/system/parallel-assembly-solve/test.py'
--- test/system/parallel-assembly-solve/test.py	2011-01-31 19:21:23 +0000
+++ test/system/parallel-assembly-solve/test.py	2011-03-09 15:56:48 +0000
@@ -1,14 +1,15 @@
 "Run solver.py in parallel"
 
 __author__ = "Anders Logg (logg@xxxxxxxxx)"
-__date__ = "2009-08-17 -- 2009-09-21"
+__date__ = "2009-08-17 -- 2011-03-09"
 __copyright__ = "Copyright (C) 2009 Anders Logg"
 __license__  = "GNU LGPL version 2.1"
 
 # Modified by Johan Hake
+# Modified by Johannes Ring 2011
 
 import sys
-from dolfin_utils.commands import getoutput
+from dolfin_utils.commands import getstatusoutput
 from dolfin import has_mpi, has_parmetis
 
 if not (has_mpi() and has_parmetis()):
@@ -19,12 +20,13 @@
 num_processes = 9 # Should really be 9 here, but it breaks
 
 # Run solver.py
-output = getoutput("mpirun -n %d python solver.py" % num_processes)
+failure, output = getstatusoutput("mpirun -n %d python solver.py" % num_processes)
 if len(sys.argv) > 1 and sys.argv[1] == "--debug":
     print output
 
 # Return exit status
-if "ERROR" in output:
+if failure:
+    print output
     sys.exit(1)
 else:
     print "OK"

=== modified file 'test/system/test.py'
--- test/system/test.py	2011-01-31 19:21:23 +0000
+++ test/system/test.py	2011-03-09 15:56:48 +0000
@@ -1,11 +1,14 @@
 "Run all system tests"
 
 __author__ = "Anders Logg (logg@xxxxxxxxx)"
-__date__ = "2009-08-17 -- 2009-08-17"
+__date__ = "2009-08-17 -- 2011-03-09"
 __copyright__ = "Copyright (C) 2009 Anders Logg"
 __license__  = "GNU LGPL version 2.1"
 
+# Modified by Johannes Ring 2011
+
 import os, sys
+from dolfin_utils.commands import getstatusoutput
 
 pwd = os.path.dirname(os.path.abspath(__file__))
 
@@ -22,10 +25,11 @@
     print "Running system test: %s" % test
     print "----------------------------------------------------------------------"
     os.chdir(os.path.join(pwd, test))
-    fail = os.system(command)
+    fail, output = getstatusoutput(command)
     if fail:
         failed.append(fail)
         print "*** Failed"
+        print output
     else:
         print "OK"
 

--- End Message ---