From 59696a5b03fe2bea9a7911ab806157407064b9a9 Mon Sep 17 00:00:00 2001 From: Yuval Shalgi Date: Mon, 14 Jun 2021 16:13:10 +0300 Subject: [PATCH 1/4] python3 version --- perfecto-reporting/perfecto/Exceptions/__init__.py | 2 +- perfecto-reporting/perfecto/__init__.py | 6 +++--- .../perfecto/client/PerfectoReportiumClient.py | 8 ++++---- perfecto-reporting/perfecto/client/__init__.py | 6 +++--- .../perfecto/model/PerfectoExecutionContext.py | 4 ++-- perfecto-reporting/perfecto/model/__init__.py | 4 ++-- .../perfecto/test/TestResultFactory.py | 2 +- perfecto-reporting/perfecto/test/__init__.py | 4 ++-- tests/Conf.py | 6 +++--- tests/test-perfectoClient.py | 12 ++++++------ 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/perfecto-reporting/perfecto/Exceptions/__init__.py b/perfecto-reporting/perfecto/Exceptions/__init__.py index 70b264c..b7a0da9 100644 --- a/perfecto-reporting/perfecto/Exceptions/__init__.py +++ b/perfecto-reporting/perfecto/Exceptions/__init__.py @@ -1,2 +1,2 @@ -from ReportingException import ReportingException +from .ReportingException import ReportingException diff --git a/perfecto-reporting/perfecto/__init__.py b/perfecto-reporting/perfecto/__init__.py index 2cb040e..e730312 100644 --- a/perfecto-reporting/perfecto/__init__.py +++ b/perfecto-reporting/perfecto/__init__.py @@ -1,3 +1,3 @@ -from client import * -from model import * -from test import * \ No newline at end of file +from .client import * +from .model import * +from .test import * \ No newline at end of file diff --git a/perfecto-reporting/perfecto/client/PerfectoReportiumClient.py b/perfecto-reporting/perfecto/client/PerfectoReportiumClient.py index 2681a03..13c0eb5 100644 --- a/perfecto-reporting/perfecto/client/PerfectoReportiumClient.py +++ b/perfecto-reporting/perfecto/client/PerfectoReportiumClient.py @@ -1,5 +1,5 @@ -from constants import * -from PerfectoDeprecator import deprecated +from .constants import * +from .PerfectoDeprecator import deprecated class PerfectoReportiumClient: @@ -54,7 +54,7 @@ def test_start(self, name, context): where each Custom Field is in the form = """ str_cFields = [] - for key, val in cFields.items(): + for key, val in list(cFields.items()): cFieldS = key + '=' + val str_cFields.append(cFieldS) @@ -118,7 +118,7 @@ def test_stop(self, test_result,context=None): where each Custom Field is in the form = """ str_cFields = [] - for key, val in cFields.items(): + for key, val in list(cFields.items()): cFieldS = key + '=' + val str_cFields.append(cFieldS) diff --git a/perfecto-reporting/perfecto/client/__init__.py b/perfecto-reporting/perfecto/client/__init__.py index 310276c..7b43155 100644 --- a/perfecto-reporting/perfecto/client/__init__.py +++ b/perfecto-reporting/perfecto/client/__init__.py @@ -1,3 +1,3 @@ -from constants import * -from PerfectoReportiumClient import PerfectoReportiumClient -from PerfectoDeprecator import deprecated \ No newline at end of file +from .constants import * +from .PerfectoReportiumClient import PerfectoReportiumClient +from .PerfectoDeprecator import deprecated \ No newline at end of file diff --git a/perfecto-reporting/perfecto/model/PerfectoExecutionContext.py b/perfecto-reporting/perfecto/model/PerfectoExecutionContext.py index 3e063e3..f9ccf1d 100644 --- a/perfecto-reporting/perfecto/model/PerfectoExecutionContext.py +++ b/perfecto-reporting/perfecto/model/PerfectoExecutionContext.py @@ -8,8 +8,8 @@ def __init__(self, webdriver, tags=None, job=None, project=None, customFields=[] clean_tags = [] if tags is not None: for tag in tags: - if not isinstance(tag, basestring): - print 'Warnning: perfecto tags must be strings, please change your tag:' + str(tag) + if not isinstance(tag, str): + print('Warnning: perfecto tags must be strings, please change your tag:' + str(tag)) else: clean_tags.append(tag) self.context_tags = clean_tags diff --git a/perfecto-reporting/perfecto/model/__init__.py b/perfecto-reporting/perfecto/model/__init__.py index 1995c3d..4ee6115 100644 --- a/perfecto-reporting/perfecto/model/__init__.py +++ b/perfecto-reporting/perfecto/model/__init__.py @@ -1,2 +1,2 @@ -from model import * -from PerfectoExecutionContext import PerfectoExecutionContext +from .model import * +from .PerfectoExecutionContext import PerfectoExecutionContext diff --git a/perfecto-reporting/perfecto/test/TestResultFactory.py b/perfecto-reporting/perfecto/test/TestResultFactory.py index 28ab047..bb809d7 100644 --- a/perfecto-reporting/perfecto/test/TestResultFactory.py +++ b/perfecto-reporting/perfecto/test/TestResultFactory.py @@ -1,4 +1,4 @@ -from TestResult import TestResultSuccess, TestResultFailure +from .TestResult import TestResultSuccess, TestResultFailure class TestResultFactory: diff --git a/perfecto-reporting/perfecto/test/__init__.py b/perfecto-reporting/perfecto/test/__init__.py index e1eb9e1..5c472e5 100644 --- a/perfecto-reporting/perfecto/test/__init__.py +++ b/perfecto-reporting/perfecto/test/__init__.py @@ -1,2 +1,2 @@ -from TestContext import TestContext -from TestResultFactory import TestResultFactory +from .TestContext import TestContext +from .TestResultFactory import TestResultFactory diff --git a/tests/Conf.py b/tests/Conf.py index d450ce7..b1b66ff 100644 --- a/tests/Conf.py +++ b/tests/Conf.py @@ -21,7 +21,7 @@ def setUp(self): 'model': 'Galaxy S9', 'securityToken' : self.securityToken } - print ('capabilities:' + capabilities); + print(('capabilities:' + capabilities)); self.driver = webdriver.Remote('https://' + self.host + '/nexperience/perfectomobile/wd/hub', capabilities) self.create_reporting_client() self.reporting_client.test_start(self.id(), TestContext('daniela@perfectomobile.com', 'Python', 'unittest')) @@ -40,10 +40,10 @@ def tearDown(self): self.reporting_client.test_stop(TestResultFactory.create_failure(self.currentResult.errors, self.currentResult.failures)) # Print report's url - print 'Report-Url: ' + self.reporting_client.report_url() + '\n' + print('Report-Url: ' + self.reporting_client.report_url() + '\n') except Exception as e: - print e.message + print(e.message) self.driver.quit() diff --git a/tests/test-perfectoClient.py b/tests/test-perfectoClient.py index 120a4cb..1ff21cd 100644 --- a/tests/test-perfectoClient.py +++ b/tests/test-perfectoClient.py @@ -21,14 +21,14 @@ def test_python_sdk_should_fail(self): self.reporting_client.step_start('Search: PerfectoCode GitHub repo - Should fail') self.driver.find_element(By.NAME, 'qq').send_keys('PerfectoCode GitHub') self.reporting_client.step_end() - print "test %s passed",i + print("test %s passed",i) break except Exception as e: - print "trying test failed " + str(e) - print str(e) - print e.__doc__ - print e.message - print traceback.format_exc() + print("trying test failed " + str(e)) + print(str(e)) + print(e.__doc__) + print(e.message) + print(traceback.format_exc()) if __name__ == '__main__': From 00268e6c78414a003646ce5fac3c151ee58d7364 Mon Sep 17 00:00:00 2001 From: Yuval Shalgi Date: Mon, 5 Jul 2021 18:00:38 +0300 Subject: [PATCH 2/4] fix indent --- perfecto-reporting/perfecto/model/model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perfecto-reporting/perfecto/model/model.py b/perfecto-reporting/perfecto/model/model.py index 49cbd6c..d960845 100644 --- a/perfecto-reporting/perfecto/model/model.py +++ b/perfecto-reporting/perfecto/model/model.py @@ -15,4 +15,4 @@ class CustomField: def __init__(self, key, value): self.dict = {key: value} self.value = value - self.key = key + self.key = key From 9133399be5b9934216487077fd3be002dd644661 Mon Sep 17 00:00:00 2001 From: Yuval Shalgi Date: Mon, 5 Jul 2021 18:15:10 +0300 Subject: [PATCH 3/4] tabs --- perfecto-reporting/perfecto/model/model.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/perfecto-reporting/perfecto/model/model.py b/perfecto-reporting/perfecto/model/model.py index d960845..516dff8 100644 --- a/perfecto-reporting/perfecto/model/model.py +++ b/perfecto-reporting/perfecto/model/model.py @@ -10,9 +10,9 @@ def __init__(self, name, number=0, branch=None): self.number = number self.branch = branch - + class CustomField: def __init__(self, key, value): self.dict = {key: value} self.value = value - self.key = key + self.key = key From f09bd0a5fd07bcaacd6ffc64d026a20f7195ffa3 Mon Sep 17 00:00:00 2001 From: Yuval Shalgi Date: Mon, 5 Jul 2021 18:32:05 +0300 Subject: [PATCH 4/4] message error removed --- README.md | 6 +++--- tests/Conf.py | 2 +- tests/test-perfectoClient.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index aa9ecd9..1ba41c7 100644 --- a/README.md +++ b/README.md @@ -44,10 +44,10 @@ def tearDown(self): else: self.reporting_client.test_stop(TestResultFactory.create_failure(self.currentResult.errors, self.currentResult.failures)) - # Print report's url - print 'Report-Url: ' + self.reporting_client.report_url() + '\n' + # Print(report's url) + print('Report-Url: ' + self.reporting_client.report_url() + '\n') except Exception as e: - print e.message + print(str(e) self.driver.quit() ``` diff --git a/tests/Conf.py b/tests/Conf.py index b1b66ff..b928759 100644 --- a/tests/Conf.py +++ b/tests/Conf.py @@ -43,7 +43,7 @@ def tearDown(self): print('Report-Url: ' + self.reporting_client.report_url() + '\n') except Exception as e: - print(e.message) + print(str(e)) self.driver.quit() diff --git a/tests/test-perfectoClient.py b/tests/test-perfectoClient.py index 1ff21cd..e4992ff 100644 --- a/tests/test-perfectoClient.py +++ b/tests/test-perfectoClient.py @@ -27,7 +27,7 @@ def test_python_sdk_should_fail(self): print("trying test failed " + str(e)) print(str(e)) print(e.__doc__) - print(e.message) + print(e.args) print(traceback.format_exc())