From 93db4a4a5bdb7ecbc16b00b0e351e7df319bdf40 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 24 Jun 2013 13:06:11 +1000 Subject: [PATCH] autotest: consider lack of symlinks to be a soft error some people use VMWare shared drives, which don't do hard links --- Tools/autotest/apmrover2.py | 5 ++++- Tools/autotest/arducopter.py | 10 ++++++++-- Tools/autotest/arduplane.py | 5 ++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Tools/autotest/apmrover2.py b/Tools/autotest/apmrover2.py index 11c80ce5df..2f10a1c600 100644 --- a/Tools/autotest/apmrover2.py +++ b/Tools/autotest/apmrover2.py @@ -114,7 +114,10 @@ def drive_APMrover2(viewerip=None, map=False): print("buildlog=%s" % buildlog) if os.path.exists(buildlog): os.unlink(buildlog) - os.link(logfile, buildlog) + try: + os.link(logfile, buildlog) + except Exception: + pass mavproxy.expect('Received [0-9]+ parameters') diff --git a/Tools/autotest/arducopter.py b/Tools/autotest/arducopter.py index 3c747ec341..059f1bbf09 100644 --- a/Tools/autotest/arducopter.py +++ b/Tools/autotest/arducopter.py @@ -583,7 +583,10 @@ def fly_ArduCopter(viewerip=None, map=False): print("buildlog=%s" % buildlog) if os.path.exists(buildlog): os.unlink(buildlog) - os.link(logfile, buildlog) + try: + os.link(logfile, buildlog) + except Exception: + pass # the received parameters can come before or after the ready to fly message mavproxy.expect(['Received [0-9]+ parameters', 'Ready to FLY']) @@ -867,7 +870,10 @@ def fly_CopterAVC(viewerip=None, map=False): print("buildlog=%s" % buildlog) if os.path.exists(buildlog): os.unlink(buildlog) - os.link(logfile, buildlog) + try: + os.link(logfile, buildlog) + except Exception: + pass # the received parameters can come before or after the ready to fly message mavproxy.expect(['Received [0-9]+ parameters', 'Ready to FLY']) diff --git a/Tools/autotest/arduplane.py b/Tools/autotest/arduplane.py index 5b199ead6c..e9c1b47867 100644 --- a/Tools/autotest/arduplane.py +++ b/Tools/autotest/arduplane.py @@ -264,7 +264,10 @@ def fly_ArduPlane(viewerip=None, map=False): print("buildlog=%s" % buildlog) if os.path.exists(buildlog): os.unlink(buildlog) - os.link(logfile, buildlog) + try: + os.link(logfile, buildlog) + except Exception: + pass mavproxy.expect('Received [0-9]+ parameters')