diff options
Diffstat (limited to 'meta/lib/oeqa/runexported.py')
-rwxr-xr-x | meta/lib/oeqa/runexported.py | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/meta/lib/oeqa/runexported.py b/meta/lib/oeqa/runexported.py index f333879c22..52c1171a3a 100755 --- a/meta/lib/oeqa/runexported.py +++ b/meta/lib/oeqa/runexported.py | |||
@@ -30,7 +30,7 @@ except ImportError: | |||
30 | 30 | ||
31 | sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "oeqa"))) | 31 | sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "oeqa"))) |
32 | 32 | ||
33 | from oeqa.oetest import TestContext | 33 | from oeqa.oetest import ExportTestContext |
34 | from oeqa.utils.sshcontrol import SSHControl | 34 | from oeqa.utils.sshcontrol import SSHControl |
35 | from oeqa.utils.dump import get_host_dumper | 35 | from oeqa.utils.dump import get_host_dumper |
36 | 36 | ||
@@ -69,10 +69,6 @@ class MyDataDict(dict): | |||
69 | def getVar(self, key, unused = None): | 69 | def getVar(self, key, unused = None): |
70 | return self.get(key, "") | 70 | return self.get(key, "") |
71 | 71 | ||
72 | class ExportTestContext(TestContext): | ||
73 | def __init__(self, d): | ||
74 | self.d = d | ||
75 | |||
76 | def main(): | 72 | def main(): |
77 | 73 | ||
78 | parser = argparse.ArgumentParser() | 74 | parser = argparse.ArgumentParser() |
@@ -111,20 +107,12 @@ def main(): | |||
111 | if not os.path.isdir(d["DEPLOY_DIR"]): | 107 | if not os.path.isdir(d["DEPLOY_DIR"]): |
112 | print("WARNING: The path to DEPLOY_DIR does not exist: %s" % d["DEPLOY_DIR"]) | 108 | print("WARNING: The path to DEPLOY_DIR does not exist: %s" % d["DEPLOY_DIR"]) |
113 | 109 | ||
114 | |||
115 | target = FakeTarget(d) | 110 | target = FakeTarget(d) |
116 | for key in loaded["target"].keys(): | 111 | for key in loaded["target"].keys(): |
117 | setattr(target, key, loaded["target"][key]) | 112 | setattr(target, key, loaded["target"][key]) |
118 | 113 | ||
119 | target.exportStart() | 114 | target.exportStart() |
120 | tc = ExportTestContext(d) | 115 | tc = ExportTestContext(d, target, True) |
121 | |||
122 | setattr(tc, "d", d) | ||
123 | setattr(tc, "target", target) | ||
124 | for key in loaded.keys(): | ||
125 | if key != "d" and key != "target" and key != "host_dumper": | ||
126 | setattr(tc, key, loaded[key]) | ||
127 | |||
128 | tc.loadTests() | 116 | tc.loadTests() |
129 | tc.runTests() | 117 | tc.runTests() |
130 | 118 | ||