From 71451867edfac6fbf953636b44b5471f43eb7136 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Thu, 18 Dec 2014 16:07:35 +0100 Subject: [PATCH] Enable functional testing with local ramdisk source Change-Id: Ie0028133c088e393df3c0723d9cdf297b4316fbc --- functest/run.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/functest/run.py b/functest/run.py index 6787b330d..1ff7e840d 100644 --- a/functest/run.py +++ b/functest/run.py @@ -17,6 +17,7 @@ import eventlet eventlet.monkey_patch(thread=False) import os +import re import shutil import subprocess import sys @@ -67,7 +68,11 @@ class Test(base.NodeTest): open(os.path.join(net_ifaces, fname), 'wb').close() ramdisk_url = os.environ.get('RAMDISK_SOURCE', RAMDISK) - ramdisk = requests.get(ramdisk_url).content + if re.match(r'^https?://', ramdisk_url): + ramdisk = requests.get(ramdisk_url).content + else: + with open(ramdisk_url, 'rb') as f: + ramdisk = f.read() ramdisk = ramdisk.replace('/proc/cpuinfo', os.path.join(self.env, 'cpuinfo.txt')) ramdisk = ramdisk.replace('/sys/class/net', net_ifaces)