From b7fe2278382ea15933fdcfae20a3b8b1f71ee4e3 Mon Sep 17 00:00:00 2001
From: debugtalk <mail@debugtalk.com>
Date: Tue, 24 Oct 2017 15:11:06 +0800
Subject: [PATCH] remove jenkins-mail-py plugin

---
 README.md  | 66 +-----------------------------------------------------
 ate/cli.py | 16 +++----------
 2 files changed, 4 insertions(+), 78 deletions(-)

diff --git a/README.md b/README.md
index de164040..f5aa3fbe 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Take full reuse of Python's existing powerful libraries: [`Requests`][requests],
 - With `debugtalk.py` plugin, module functions can be auto-discovered in recursive upward directories.
 - Testcases can be run in diverse ways, with single testset, multiple testsets, or entire project folder.
 - Test report is concise and clear, with detailed log records. See [`PyUnitReport`][PyUnitReport].
-- Perfect combination with [Jenkins][Jenkins], running continuous integration test and production environment monitoring. Send mail notification with [`jenkins-mail-py`][jenkins-mail-py].
+- Perfect combination with [Jenkins][Jenkins], running continuous integration test and production environment monitoring.
 - With reuse of [`Locust`][Locust], you can run performance test without extra work.
 - It is extensible to facilitate the implementation of web platform with [`Flask`][flask] framework.
 
@@ -65,70 +65,6 @@ optional arguments:
   --failfast            Stop the test run on the first error or failure.
 ```
 
-### use `jenkins-mail-py` plugin
-
-If you want to use `ApiTestEngine` with Jenkins, you may need to send mail notification, and [`jenkins-mail-py`][jenkins-mail-py] will be of great help.
-
-To install mail helper, run this command in your terminal:
-
-```text
-$ pip install -U git+https://github.com/debugtalk/jenkins-mail-py.git#egg=jenkins-mail-py
-$ ate -V
-jenkins-mail-py version: 0.2.5
-ApiTestEngine version: 0.7.4
-```
-
-With [`jenkins-mail-py`][jenkins-mail-py] installed, you can see more optional arguments.
-
-```text
-$ ate -h
-usage: ate [-h] [-V] [--log-level LOG_LEVEL] [--report-name REPORT_NAME]
-           [--failfast] [--startproject STARTPROJECT]
-           [--mailgun-smtp-username MAILGUN_SMTP_USERNAME]
-           [--mailgun-smtp-password MAILGUN_SMTP_PASSWORD]
-           [--mail-sender MAIL_SENDER]
-           [--mail-recepients [MAIL_RECEPIENTS [MAIL_RECEPIENTS ...]]]
-           [--mail-subject MAIL_SUBJECT] [--mail-content MAIL_CONTENT]
-           [--jenkins-job-name JENKINS_JOB_NAME]
-           [--jenkins-job-url JENKINS_JOB_URL]
-           [--jenkins-build-number JENKINS_BUILD_NUMBER]
-           [testset_paths [testset_paths ...]]
-
-Api Test Engine.
-
-positional arguments:
-  testset_paths         testset file path
-
-optional arguments:
-  -h, --help            show this help message and exit
-  -V, --version         show version
-  --log-level LOG_LEVEL
-                        Specify logging level, default is INFO.
-  --report-name REPORT_NAME
-                        Specify report name, default is generated time.
-  --failfast            Stop the test run on the first error or failure.
-  --startproject STARTPROJECT
-                        Specify new project name.
-  --mailgun-smtp-username MAILGUN_SMTP_USERNAME
-                        Specify mailgun smtp username.
-  --mailgun-smtp-password MAILGUN_SMTP_PASSWORD
-                        Specify mailgun smtp password.
-  --mail-sender MAIL_SENDER
-                        Specify email sender.
-  --mail-recepients [MAIL_RECEPIENTS [MAIL_RECEPIENTS ...]]
-                        Specify email recepients.
-  --mail-subject MAIL_SUBJECT
-                        Specify email subject.
-  --mail-content MAIL_CONTENT
-                        Specify email content.
-  --jenkins-job-name JENKINS_JOB_NAME
-                        Specify jenkins job name.
-  --jenkins-job-url JENKINS_JOB_URL
-                        Specify jenkins job url.
-  --jenkins-build-number JENKINS_BUILD_NUMBER
-                        Specify jenkins build number.
-```
-
 ## Write testcases
 
 It is recommended to write testcases in `YAML` format.
diff --git a/ate/cli.py b/ate/cli.py
index 92971fe0..2d04409c 100644
--- a/ate/cli.py
+++ b/ate/cli.py
@@ -35,12 +35,6 @@ def main_ate():
         '--startproject',
         help="Specify new project name.")
 
-    try:
-        from jenkins_mail_py import MailgunHelper
-        mailer = MailgunHelper(parser)
-    except ImportError:
-        mailer = None
-
     args = parser.parse_args()
 
     if args.version:
@@ -63,7 +57,7 @@ def main_ate():
                         report name is ignored, use generated time instead.")
 
     results = {}
-    subject = "SUCCESS"
+    success = True
 
     for testset_path in set(args.testset_paths):
 
@@ -86,16 +80,12 @@ def main_ate():
         })
 
         if len(result.successes) != result.testsRun:
-            subject = "FAILED"
+            success = False
 
         for task in task_suite.tasks:
             task.print_output()
 
-    flag_code = 0 if subject == "SUCCESS" else 1
-    if mailer and mailer.config_ready:
-        mailer.send_mail(subject, results, flag_code)
-
-    return flag_code
+    return 0 if success is True else 1
 
 def main_locust():
     """ Performance test with locust: parse command line options and run commands.