Skip to content

Added code for allure1 and allure2 to coexist, and defined pytest.all… …ure in global namespace #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
shreyashah wants to merge 5 commits into from
Closed

Added code for allure1 and allure2 to coexist, and defined pytest.all… …ure in global namespace #22

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5cf4454
Move the allure report generation from allure plugin to cafy plugin a…
shreyash45 Dec 13, 2018
0354648
make sessionfinish hook to be executed in last instead of first to pr…
shreyash45 Dec 13, 2018
8a21920
Added code for allure1 and allure2 to coexist, and defined pytest.all…
shreyash45 Jan 9, 2019
6a45adc
Added code for allure1 and allure2 to coexist, and defined pytest.all…
shreyash45 Jan 9, 2019
d404b8e
Merge branch 'master' of https://github.com/kuamrend/cafy-pytest into…
shreyash45 Jan 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 101 additions & 1 deletion pytest_cafy/plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,17 @@
from utils.cafyexception import CafyException
from debug import DebugLibrary

#Following assignments are added for keeping backward compatibility of allure2 with allure1
#Since in allure2, a step is created with a decorator of @allure.step unlike @pytest.allure.step in allure1
import allure
pytest.allure = allure
pytest.allure.step = allure.step
pytest.allure.attach = allure.attach
pytest.allure.label = allure.label
pytest.allure.feature = allure.feature
pytest.allure.story = allure.story


#Check with CAFYKIT_HOME or GIT_REPO or CAFYAP_REPO environment is set,
#if all are set, CAFYAP_REPO takes precedence
CAFY_REPO = os.environ.get("CAFYAP_REPO", None)
Expand Down Expand Up @@ -1418,7 +1429,7 @@ def _get_analyzer_log(self):
self.log.info('No Analyzer log file receiver')


@pytest.hookimpl(tryfirst=True)
@pytest.hookimpl(trylast=True)
def pytest_sessionfinish(self):
test_data_file = os.path.join(CafyLog.work_dir, "testdata.json")
self.log.info("Test data generated at %s" % test_data_file)
Expand Down Expand Up @@ -1465,6 +1476,95 @@ def pytest_sessionfinish(self):
f.write(json.dumps(self.log.buffer_to_retest))
except Exception as error:
self.log.info(error)

# Check if using allure1 : This is by checking if xml file is generated in ARCHIVE
ARCHIVE = os.environ.get('ARCHIVE')
files = [os.path.join(ARCHIVE, f)
for f in os.listdir(ARCHIVE) if '-testsuite.xml' in f]
if files:
self.log.info("allure1 is being used")
print('\nxmlfile_link : ')
for f in files:
print(f)
print('\n')

# If no-allure option is not given, which means you want to
# generate allure report
if os.environ.get('NOALLURE') != 'True':
# If xml file is created, then generate html report
if files:
allure_path = '/auto/cafy/cafykit/allure/bin/allure'
if os.path.exists(allure_path):
# This cmd generates html file named index.html from xml
cmd = allure_path + ' report generate ' + ARCHIVE + ' -o ' + ARCHIVE
else:
# Assuming the code is not being ran from /ws or /auto, instead
# it could be the local machine, so you need to install allure cli.
# and Java 7+ version. We assume,its already installed
# This cmd generates html file named index.html from xml
cmd = 'allure generate ' + ARCHIVE + ' -o ' + ARCHIVE
print('Generating combined allure report using: \n{}'.format(cmd))
os.system(cmd)
generated_html_filename = 'index.html'
path = CAFY_REPO
file_link = os.path.join(
os.path.sep, ARCHIVE, generated_html_filename)
if os.path.isfile(file_link):
if path.startswith(('/auto', '/ws')):
html_link = '/'.join(['http://allure.cisco.com', file_link])
else:
html_link = '/'.join(['file:///', file_link])
print('html_link :')
print(html_link)
CafyLog.htmlfile_link = file_link
else:
print('\n Allure html report not generated')

else:
print('\n Allure XML file not created')

else:
files = [os.path.join(ARCHIVE, f)
for f in os.listdir(ARCHIVE) if '.json' in f]
if files:
self.log.info("allure2 is being used")
allure_path = '/auto/cafy/cafykit/allure2/bin/allure'
if os.path.exists(allure_path):
# This cmd generates html file named index.html from json in ARCHIVE/allure-report
allure_report_html_dir = os.path.join(ARCHIVE, 'allure-report' )
cmd = allure_path + ' generate ' + ARCHIVE + ' -o ' + allure_report_html_dir
else:
# Assuming the code is not being ran from /ws or /auto, instead
# it could be the local machine, so you need to install allure cli.
# and Java 8+ version. We assume,its already installed
# This cmd generates html file named index.html from json
cmd = 'allure generate ' + ARCHIVE + ' -o ' + allure_report_html_dir
print('Generating combined allure report using: \n{}'.format(cmd))
os.system(cmd)
json_file = [os.path.join(ARCHIVE, 'allure-report', 'data', 'suites.json')
for f in os.listdir(os.path.join(ARCHIVE, 'allure-report', 'data')) if 'suites.json' in f]
print('\njsonfile_link : ')
for f in json_file:
print(f)
print('\n')

generated_html_filename = 'index.html'
file_link = os.path.join(
os.path.sep, allure_report_html_dir, generated_html_filename)
if os.path.isfile(file_link):
path = CAFY_REPO
if path.startswith(('/auto', '/ws')):
html_link = '/'.join(['http://allure.cisco.com', file_link])
else:
html_link = '/'.join(['file:///', file_link])
print('html_link :')
print(html_link)
CafyLog.htmlfile_link = file_link
else:
print('\n Allure2 html report not generated')



'''
line_regex = re.compile(r"\-\w*\-{1,}\-\d{4}\-\d{2}\-\d{2}T\d*\-\d*\-\d*\[([\w\-:]*)\](\[.*\])?>")
log_filename = os.path.join(CafyLog.work_dir, 'all.log')
Expand Down