[oe-commits] Lucian Musat : oeqa/ptest: Removed buildhistory as requirement for ptest

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 990c0048fc7fe363b679943fe0ed0434645711d9
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=990c0048fc7fe363b679943fe0ed0434645711d9

Author: Lucian Musat <george.l.musat at intel.com>
Date:   Wed Jan 14 17:14:15 2015 +0200

oeqa/ptest: Removed buildhistory as requirement for ptest

Signed-off-by: Lucian Musat <george.l.musat at intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/lib/oeqa/runtime/_ptest.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/meta/lib/oeqa/runtime/_ptest.py b/meta/lib/oeqa/runtime/_ptest.py
index 53b0807..bf4d041 100644
--- a/meta/lib/oeqa/runtime/_ptest.py
+++ b/meta/lib/oeqa/runtime/_ptest.py
@@ -99,8 +99,6 @@ class PtestRunnerTest(oeRuntimeTest):
         return complementary_pkgs.split()
 
     def setUp(self):
-        self.buildhist_dir = oeRuntimeTest.tc.d.getVar("BUILDHISTORY_DIR_IMAGE", True)
-        self.assertTrue(os.path.exists(self.buildhist_dir))
         self.ptest_log = os.path.join(oeRuntimeTest.tc.d.getVar("TEST_LOG_DIR",True), "ptest-%s.log" % oeRuntimeTest.tc.d.getVar('DATETIME', True))
 
     @skipUnlessPassed('test_ssh')
@@ -113,12 +111,12 @@ class PtestRunnerTest(oeRuntimeTest):
 
         self.target.run('/usr/bin/ptest-runner > /tmp/ptest.log 2>&1', 0)
         self.target.copy_from('/tmp/ptest.log', self.ptest_log)
-        shutil.copyfile(self.ptest_log, os.path.join(self.buildhist_dir, "ptest.log"))
+        shutil.copyfile(self.ptest_log, "ptest.log")
 
-        result = self.parse_ptest(os.path.join(self.buildhist_dir, "ptest.log"))
+        result = self.parse_ptest("ptest.log")
         log_results_to_location = "./results"
         if os.path.exists(log_results_to_location):
             shutil.rmtree(log_results_to_location)
         os.makedirs(log_results_to_location)
 
-        result.log_as_files(log_results_to_location, test_status = ['fail'])
+        result.log_as_files(log_results_to_location, test_status = ['pass','fail'])