python3-salttesting: upgrade 2015.2.16 -> 2018.9.21

Refresh the following patch:
0001-Add-ptest-output-option-to-test-suite.patch

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

3 files changed, 33 insertions, 35 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-salttesting_2015.2.16.bb b/meta-openstack/recipes-devtools/python/python-salttesting_2015.2.16.bb
deleted file mode 100644
index d5d1e3e..0000000
--- a/meta-openstack/recipes-devtools/python/python-salttesting_2015.2.16.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "Common testing tools used in the Salt Stack projects"
-HOMEPAGE = "https://github.com/saltstack/salt-testing"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=f36f1e9e3e30f90180efdf7e40d943e5"
-SRCNAME = "salt-testing"
-
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}"
-
-SRC_URI = "https://github.com/saltstack/salt-testing/archive/v${PV}.tar.gz;downloadfilename=salt-testing-v${PV}.tar.gz \
-           file://0001-Add-ptest-output-option-to-test-suite.patch \
-           "
-SRC_URI[md5sum] = "8ca55a796e9ad7ba72bc143043753ccf"
-SRC_URI[sha256sum] = "0ef4be6a8a9b505ae1c328394dfad50493674af6100c7e2c220f374533d86edc"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-RDEPENDS_${PN} = "\
-                  python-mock \
-                  python-unittest \
-"
-
-inherit setuptools3
-
diff --git a/meta-openstack/recipes-devtools/python/python-salttesting/0001-Add-ptest-output-option-to-test-suite.patch b/meta-openstack/recipes-devtools/python/python3-salttesting/0001-Add-ptest-output-option-to-test-suite.patch
index e86768a..f1628a3 100644
--- a/meta-openstack/recipes-devtools/python/python-salttesting/0001-Add-ptest-output-option-to-test-suite.patch
+++ b/meta-openstack/recipes-devtools/python/python3-salttesting/0001-Add-ptest-output-option-to-test-suite.patch
@@ -1,6 +1,6 @@
-From 1950b943b7173198f345a1cff7b7f771cbac2244 Mon Sep 17 00:00:00 2001
-From: Collin Richards <collin.richards@ni.com>
-Date: Tue, 28 Jun 2016 16:02:22 -0500
+From 61ba63c3cde920873b8df48b950b8ebb79158346 Mon Sep 17 00:00:00 2001
+From: Wang Mingyu <wangmy@cn.fujitsu.com>
+Date: Thu, 19 Nov 2020 11:20:58 +0900
 Subject: [PATCH] Add ptest output option to test suite
 
 Extend salttesting to support outputing the results of running the test
@@ -9,26 +9,28 @@ suite in ptest format.
 Upstream-Status: Inappropriate [OE specific]
 
 Signed-off-by: Collin Richards <collin.richards@ni.com>
+Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
+
 Natinst-ReviewBoard-ID: 143279
 ---
  salttesting/parser/__init__.py |  12 +++
- salttesting/ptest.py           | 165 +++++++++++++++++++++++++++++++++++++++++
+ salttesting/ptest.py           | 165 +++++++++++++++++++++++++++++++++
  2 files changed, 177 insertions(+)
  create mode 100644 salttesting/ptest.py
 
 diff --git a/salttesting/parser/__init__.py b/salttesting/parser/__init__.py
-index 1e7275b..d8cba0c 100644
+index d752acf..b41e5ea 100644
 --- a/salttesting/parser/__init__.py
 +++ b/salttesting/parser/__init__.py
-@@ -25,6 +25,7 @@ from functools import partial
- from contextlib import closing
+@@ -28,6 +28,7 @@ from contextlib import closing
  
+ import six
  from salttesting import TestLoader, TextTestRunner
 +from salttesting.ptest import PTestRunner
+ from salttesting import helpers
  from salttesting.version import __version_info__
  from salttesting.xmlunit import HAS_XMLRUNNER, XMLTestRunner
- try:
-@@ -264,6 +265,12 @@ class SaltTestingParser(optparse.OptionParser):
+@@ -277,6 +278,12 @@ class SaltTestingParser(optparse.OptionParser):
              action='store_true',
              help='Do NOT show the overall tests result'
          )
@@ -41,7 +43,7 @@ index 1e7275b..d8cba0c 100644
          self.add_option_group(self.output_options_group)
  
          self.fs_cleanup_options_group = optparse.OptionGroup(
-@@ -491,6 +498,11 @@ class SaltTestingParser(optparse.OptionParser):
+@@ -531,6 +538,11 @@ class SaltTestingParser(optparse.OptionParser):
                  verbosity=self.options.verbosity
              ).run(tests)
              self.testsuite_results.append((header, runner))
@@ -225,5 +227,5 @@ index 0000000..4c50f57
 +        self.stream.writeln()
 +        return result
 -- 
-2.13.2
+2.25.1
 
diff --git a/meta-openstack/recipes-devtools/python/python3-salttesting_git.bb b/meta-openstack/recipes-devtools/python/python3-salttesting_git.bb
new file mode 100644
index 0000000..3447621
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python3-salttesting_git.bb
@@ -0,0 +1,20 @@
+SUMMARY = "Common testing tools used in the Salt Stack projects"
+HOMEPAGE = "https://github.com/saltstack/salt-testing"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=f36f1e9e3e30f90180efdf7e40d943e5"
+
+SRC_URI = "git://github.com/saltstack/salt-testing.git;branch=develop;tag=v2018.9.21 \
+           file://0001-Add-ptest-output-option-to-test-suite.patch \
+           "
+
+PV = "2018.9.21+git${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+RDEPENDS_${PN} = "\
+                  python3-mock \
+                  python3-unittest \
+"
+
+inherit setuptools3