summaryrefslogtreecommitdiff
path: root/validation
diff options
context:
space:
mode:
authorJean-Philippe NOEL2013-02-19 14:10:47 +0100
committerJean-Philippe NOEL2013-02-21 11:59:53 +0100
commit6171ba9c9246680c1122037f67f36ae53c8647a1 (patch)
treec5d301bef74f955e1810eb4783a6361baec7eff3 /validation
parent5815c4f057cce14a47064fc9129888a40de602e5 (diff)
validation/validlib: move spc300.unzip to rst_utils, closes #3777
Diffstat (limited to 'validation')
-rw-r--r--validation/validlib/rst_utils.py10
-rw-r--r--validation/validlib/spc300.py9
2 files changed, 9 insertions, 10 deletions
diff --git a/validation/validlib/rst_utils.py b/validation/validlib/rst_utils.py
index 5ffd1f9107..5858be6a39 100644
--- a/validation/validlib/rst_utils.py
+++ b/validation/validlib/rst_utils.py
@@ -3,7 +3,7 @@
import subprocess
import re
import os
-import spc300
+import gzip
import list_utils
@@ -95,7 +95,7 @@ def group_by_aux(group_size, elements, acc):
def format_tail(root, head, tail):
path = os.path.join(root, head, tail)
- content = spc300.unzip(path)
+ content = unzip(path)
content = content.split("\n")
content = content[0:5]
content = map(shred, content)
@@ -107,6 +107,12 @@ def shred(line):
sublines = group_by(80, line)
return "".join([ " " + subline + "\n" for subline in sublines ])
+def unzip(zip_file_path):
+ zip_file_handler = gzip.open(zip_file_path, 'rb')
+ zip_file_content = zip_file_handler.read()
+ zip_file_handler.close()
+ return zip_file_content
+
if __name__ == "__main__":
assert ("head1/head2", "tail1/tail2/tail3") == \
diff --git a/validation/validlib/spc300.py b/validation/validlib/spc300.py
index 06040c693c..a185c9406c 100644
--- a/validation/validlib/spc300.py
+++ b/validation/validlib/spc300.py
@@ -2,7 +2,6 @@
"""Module allowing to command and control the plug SPC300"""
-import gzip
import tarfile
import tempfile
import shutil
@@ -344,7 +343,7 @@ def dump_trace(key, dest_directory, ftp_server, interface_index = 0):
# Remove the old traces files, if any
for file_name in os.listdir(dest_directory):
if os.path.splitext(file_name) == os.path.splitext(trace_pattern):
- os.remove(os.path.join(dest_directory, file_name)
+ os.remove(os.path.join(dest_directory, file_name))
# Copy the new traces files
for file_name in files_names:
@@ -398,12 +397,6 @@ def slow_ping(key, interface_index):
n = n + 1
return (result, n)
-def unzip(zip_file_path):
- zip_file_handler = gzip.open(zip_file_path, 'rb')
- zip_file_content = zip_file_handler.read()
- zip_file_handler.close()
- return zip_file_content
-
def untar(tar_file_path, destination_directory):
assert tarfile.is_tarfile(tar_file_path)
tar_file_content = tarfile.open(tar_file_path)