Date: Tue, 22 Sep 2015 15:03:00 +0000 (UTC) From: Michael Gmelin <grembo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397542 - head/devel/ice/files Message-ID: <201509221503.t8MF30nL088936@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: grembo Date: Tue Sep 22 15:02:59 2015 New Revision: 397542 URL: https://svnweb.freebsd.org/changeset/ports/397542 Log: Fix unit test in case hostname is not on a local interface PR: 201743 Approved by: mentors (implicit) Added: head/devel/ice/files/patch-cpp-test-Glacier2-staticFiltering-run.py (contents, props changed) Added: head/devel/ice/files/patch-cpp-test-Glacier2-staticFiltering-run.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ice/files/patch-cpp-test-Glacier2-staticFiltering-run.py Tue Sep 22 15:02:59 2015 (r397542) @@ -0,0 +1,38 @@ +--- cpp/test/Glacier2/staticFiltering/run.py.orig 2015-06-23 17:30:20.000000000 +0200 ++++ cpp/test/Glacier2/staticFiltering/run.py 2015-09-22 16:23:30.270288987 +0200 +@@ -8,7 +8,7 @@ + # + # ********************************************************************** + +-import os, sys, time, socket ++import os, sys, time, socket, subprocess + + path = [ ".", "..", "../..", "../../..", "../../../.." ] + head = os.path.dirname(sys.argv[0]) +@@ -99,12 +99,26 @@ + hostname = "127.0.0.1" + fqdn = "" + domainname = "" ++ ++ # Check if IP addresses are configured on a local interface ++ if TestUtil.isFreeBSD(): ++ p = subprocess.Popen("ifconfig", shell=1, stdout=subprocess.PIPE) ++ r = p.communicate()[0] ++ if r.find("inet " + testaddr1) == -1 or r.find("inet " + testaddr2) == 1: ++ print("Warning: Not all host IP addresses are available") ++ limitedTests = True ++ hostname = "127.0.0.1" ++ fqdn = "" ++ domainname = "" + except: + limitedTests = True + hostname = "127.0.0.1" + fqdn = "" + domainname = "" + ++if limitedTests: ++ print("Running limited tests") ++ + testcases = [ + ('testing category filter', + ('', '', '', 'foo "a cat with spaces"', '', ''),
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509221503.t8MF30nL088936>