Patchwork [3/3] oeqa/runtime/scp: replace dd call

login
register
mail settings
Submitter Mihai Lindner
Date Sept. 5, 2013, 3:52 p.m.
Message ID <7418a5c57c6c7e7eef7edebfd7e8779597e2f6b2.1378396260.git.mihaix.lindner@linux.intel.com>
Download mbox | patch
Permalink /patch/57489/
State Accepted
Commit faed110e665628aeb0582259b3a1a6606b031c87
Headers show

Comments

Mihai Lindner - Sept. 5, 2013, 3:52 p.m.
Use a file object to generate a our test file instead of calling `dd`;
removes dd's output from testimage.log, keeps unittest output clean.
Also remove unused imports.

Signed-off-by: Mihai Lindner <mihaix.lindner@linux.intel.com>
---
 meta/lib/oeqa/runtime/scp.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

Patch

diff --git a/meta/lib/oeqa/runtime/scp.py b/meta/lib/oeqa/runtime/scp.py
index b914802..03095bf 100644
--- a/meta/lib/oeqa/runtime/scp.py
+++ b/meta/lib/oeqa/runtime/scp.py
@@ -1,22 +1,21 @@ 
-import subprocess
-import unittest
 import os
-from oeqa.oetest import oeRuntimeTest
-from oeqa.utils.decorators import *
+from oeqa.oetest import oeRuntimeTest, skipModule
+from oeqa.utils.decorators import skipUnlessPassed
 
 def setUpModule():
     if not (oeRuntimeTest.hasPackage("dropbear") or oeRuntimeTest.hasPackage("openssh-sshd")):
         skipModule("No ssh package in image")
 
-
 class ScpTest(oeRuntimeTest):
 
-    def setUp(self):
-         subprocess.check_call("dd if=/dev/zero of=%s bs=512k count=10" % os.path.join(oeRuntimeTest.tc.d.getVar("TEST_LOG_DIR", True), 'test_scp_file'), shell=True)
-
     @skipUnlessPassed('test_ssh')
-    def test_scp(self):
-        (status, output) = self.target.copy_to(os.path.join(oeRuntimeTest.tc.d.getVar("TEST_LOG_DIR", True), 'test_scp_file'), '/tmp/test_scp_file')
+    def test_scp_file(self):
+        test_log_dir = oeRuntimeTest.tc.d.getVar("TEST_LOG_DIR", True)
+        test_file_path = os.path.join(test_log_dir, 'test_scp_file')
+        with open(test_file_path, 'w') as test_scp_file:
+            test_scp_file.seek(2 ** 22 - 1)
+            test_scp_file.write(os.linesep)
+        (status, output) = self.target.copy_to(test_file_path, '/tmp/test_scp_file')
         self.assertEqual(status, 0, msg = "File could not be copied. Output: %s" % output)
         (status, output) = self.target.run("ls -la /tmp/test_scp_file")
         self.assertEqual(status, 0, msg = "SCP test failed")