From debb560d03860bbecfd31e92b386aaa3b5c644b4 Mon Sep 17 00:00:00 2001 From: dzarmola Date: Fri, 26 Oct 2018 10:44:03 +0200 Subject: [PATCH 1/8] Restricted random bytes to only valid characters --- src/azure_devtools/scenario_tests/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure_devtools/scenario_tests/base.py b/src/azure_devtools/scenario_tests/base.py index 81d90f9..66efd18 100644 --- a/src/azure_devtools/scenario_tests/base.py +++ b/src/azure_devtools/scenario_tests/base.py @@ -37,7 +37,7 @@ def create_temp_file(self, size_kb, full_random=False): with open(path, mode='r+b') as f: if full_random: - chunk = os.urandom(1024) + chunk = str(map(lambda _: chr((128 - 32) * ord(_) / 255 + 32), os.urandom(1024))) else: chunk = bytearray([0] * 1024) for _ in range(size_kb): From a65858306608cd014d4d86b35177715169d20b0e Mon Sep 17 00:00:00 2001 From: dzarmola Date: Fri, 26 Oct 2018 11:03:38 +0200 Subject: [PATCH 2/8] Fixed value range & some styling --- src/azure_devtools/scenario_tests/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure_devtools/scenario_tests/base.py b/src/azure_devtools/scenario_tests/base.py index 66efd18..f458fb5 100644 --- a/src/azure_devtools/scenario_tests/base.py +++ b/src/azure_devtools/scenario_tests/base.py @@ -37,7 +37,7 @@ def create_temp_file(self, size_kb, full_random=False): with open(path, mode='r+b') as f: if full_random: - chunk = str(map(lambda _: chr((128 - 32) * ord(_) / 255 + 32), os.urandom(1024))) + chunk = "".join(chr((126 - 32) * ord(_) / 255 + 32) for _ in os.urandom(1024)) else: chunk = bytearray([0] * 1024) for _ in range(size_kb): From a4d9ca0d458474b0af2617e8530d0d273d49c23e Mon Sep 17 00:00:00 2001 From: dzarmola Date: Fri, 26 Oct 2018 11:17:14 +0200 Subject: [PATCH 3/8] Added compatibility with Python 3 --- src/azure_devtools/scenario_tests/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure_devtools/scenario_tests/base.py b/src/azure_devtools/scenario_tests/base.py index f458fb5..d6d66bf 100644 --- a/src/azure_devtools/scenario_tests/base.py +++ b/src/azure_devtools/scenario_tests/base.py @@ -37,7 +37,7 @@ def create_temp_file(self, size_kb, full_random=False): with open(path, mode='r+b') as f: if full_random: - chunk = "".join(chr((126 - 32) * ord(_) / 255 + 32) for _ in os.urandom(1024)) + chunk = "".join(chr(int((126 - 32) * (ord(_) if type(_)==str else _) / 255 + 32)) for _ in os.urandom(1024)) else: chunk = bytearray([0] * 1024) for _ in range(size_kb): From d42192147e12c42032d2d0e3bd3ce99b67ad6607 Mon Sep 17 00:00:00 2001 From: dzarmola Date: Fri, 26 Oct 2018 12:07:39 +0200 Subject: [PATCH 4/8] Update base.py --- src/azure_devtools/scenario_tests/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure_devtools/scenario_tests/base.py b/src/azure_devtools/scenario_tests/base.py index d6d66bf..5c4dd20 100644 --- a/src/azure_devtools/scenario_tests/base.py +++ b/src/azure_devtools/scenario_tests/base.py @@ -37,7 +37,7 @@ def create_temp_file(self, size_kb, full_random=False): with open(path, mode='r+b') as f: if full_random: - chunk = "".join(chr(int((126 - 32) * (ord(_) if type(_)==str else _) / 255 + 32)) for _ in os.urandom(1024)) + chunk = "".join(chr(int((126 - 32) * (ord(_) if isinstance(_, str) else _) / 255 + 32)) for _ in os.urandom(1024)) else: chunk = bytearray([0] * 1024) for _ in range(size_kb): From 45599ac565a5e49b19371599fb7632452d28ddf8 Mon Sep 17 00:00:00 2001 From: dzarmola Date: Fri, 26 Oct 2018 12:21:55 +0200 Subject: [PATCH 5/8] Style fixes --- src/azure_devtools/scenario_tests/base.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/azure_devtools/scenario_tests/base.py b/src/azure_devtools/scenario_tests/base.py index 5c4dd20..0c36915 100644 --- a/src/azure_devtools/scenario_tests/base.py +++ b/src/azure_devtools/scenario_tests/base.py @@ -37,7 +37,8 @@ def create_temp_file(self, size_kb, full_random=False): with open(path, mode='r+b') as f: if full_random: - chunk = "".join(chr(int((126 - 32) * (ord(_) if isinstance(_, str) else _) / 255 + 32)) for _ in os.urandom(1024)) + chunk = "".join(chr(int((126 - 32) * (ord(_) if isinstance(_, str) else _) + / 255 + 32)) for _ in os.urandom(1024)) else: chunk = bytearray([0] * 1024) for _ in range(size_kb): From aa7c9567264661f8b102020e90768119c6a805ab Mon Sep 17 00:00:00 2001 From: dzarmola Date: Fri, 26 Oct 2018 13:09:09 +0200 Subject: [PATCH 6/8] Style fixes --- src/azure_devtools/scenario_tests/base.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/azure_devtools/scenario_tests/base.py b/src/azure_devtools/scenario_tests/base.py index 0c36915..c6f1401 100644 --- a/src/azure_devtools/scenario_tests/base.py +++ b/src/azure_devtools/scenario_tests/base.py @@ -37,8 +37,9 @@ def create_temp_file(self, size_kb, full_random=False): with open(path, mode='r+b') as f: if full_random: - chunk = "".join(chr(int((126 - 32) * (ord(_) if isinstance(_, str) else _) - / 255 + 32)) for _ in os.urandom(1024)) + chunk = "".join(chr(int((126 - 32) + * (ord(_) if isinstance(_, str) else _) + / 255 + 32)) for _ in os.urandom(1024)) else: chunk = bytearray([0] * 1024) for _ in range(size_kb): From 2fe995275378cb49eecc68647457ac7af515c631 Mon Sep 17 00:00:00 2001 From: dzarmola Date: Fri, 26 Oct 2018 13:29:37 +0200 Subject: [PATCH 7/8] Update base.py --- src/azure_devtools/scenario_tests/base.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/azure_devtools/scenario_tests/base.py b/src/azure_devtools/scenario_tests/base.py index c6f1401..ef88219 100644 --- a/src/azure_devtools/scenario_tests/base.py +++ b/src/azure_devtools/scenario_tests/base.py @@ -37,9 +37,9 @@ def create_temp_file(self, size_kb, full_random=False): with open(path, mode='r+b') as f: if full_random: - chunk = "".join(chr(int((126 - 32) - * (ord(_) if isinstance(_, str) else _) - / 255 + 32)) for _ in os.urandom(1024)) + chunk = "".join(chr(int((126 - 32) \ + * (ord(_) if isinstance(_, str) else _) \ + / 255 + 32)) for _ in os.urandom(1024)) else: chunk = bytearray([0] * 1024) for _ in range(size_kb): From abad354d5e36cfa0810893d18b55647a6ec44139 Mon Sep 17 00:00:00 2001 From: dzarmola Date: Fri, 26 Oct 2018 13:37:45 +0200 Subject: [PATCH 8/8] Added conversion to bytearray --- src/azure_devtools/scenario_tests/base.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/azure_devtools/scenario_tests/base.py b/src/azure_devtools/scenario_tests/base.py index ef88219..29c7d29 100644 --- a/src/azure_devtools/scenario_tests/base.py +++ b/src/azure_devtools/scenario_tests/base.py @@ -37,9 +37,10 @@ def create_temp_file(self, size_kb, full_random=False): with open(path, mode='r+b') as f: if full_random: - chunk = "".join(chr(int((126 - 32) \ + chunk = bytearray("".join(chr(int((126 - 32) \ * (ord(_) if isinstance(_, str) else _) \ - / 255 + 32)) for _ in os.urandom(1024)) + / 255 + 32)) for _ in os.urandom(1024)), + 'utf-8') else: chunk = bytearray([0] * 1024) for _ in range(size_kb):