[lintian] 01/02: Tidy/split new python2 tests as they were already getting a mess.
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository lintian.
commit b3e8d0d44247457c07c3fcd88650e52a1f31d862
Author: Chris Lamb <lamby@debian.org>
Date: Fri Aug 4 11:20:47 2017 -0400
Tidy/split new python2 tests as they were already getting a mess.
---
.../debian/debian/changelog.in | 0
.../debian/debian/control.in | 21 ++++-------------
.../desc | 5 +----
t/tests/python-new-python2-package/tags | 1 +
.../debian/debian/control.in | 26 ++++++++++++++++++++++
t/tests/python-python2-no-python3-unrel/desc | 6 +++++
t/tests/python-python2-no-python3-unrel/tags | 0
.../debian/debian/control.in | 15 +++++++++++++
t/tests/python-python2-no-python3/desc | 6 +++++
t/tests/python-python2-no-python3/tags | 1 +
t/tests/python-python2/tags | 3 ---
11 files changed, 60 insertions(+), 24 deletions(-)
diff --git a/t/tests/python-python2/debian/debian/changelog.in b/t/tests/python-new-python2-package/debian/debian/changelog.in
similarity index 100%
rename from t/tests/python-python2/debian/debian/changelog.in
rename to t/tests/python-new-python2-package/debian/debian/changelog.in
diff --git a/t/tests/python-python2/debian/debian/control.in b/t/tests/python-new-python2-package/debian/debian/control.in
similarity index 53%
rename from t/tests/python-python2/debian/debian/control.in
rename to t/tests/python-new-python2-package/debian/debian/control.in
index 685219e..0d5cf70 100644
--- a/t/tests/python-python2/debian/debian/control.in
+++ b/t/tests/python-new-python2-package/debian/debian/control.in
@@ -3,9 +3,9 @@ Priority: extra
Section: python
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 9), python-sphinx
+Build-Depends: debhelper (>= 9)
-Package: python-{$source}-nopy3
+Package: python-{$source}
Architecture: all
Depends: $\{misc:Depends\}, python2.7
Description: Python 2 package with no corresponding Python 3 package
@@ -13,10 +13,8 @@ Description: Python 2 package with no corresponding Python 3 package
Lintian. It is part of the Lintian test suite and may do very odd
things. It should not be installed like a regular package. It may
be an empty package.
- .
- This is a Python 2 package with no corresponding Python 3 package.
-Package: python-{$source}-withpy3
+Package: python3-{$source}
Architecture: all
Depends: $\{misc:Depends\}, python2.7
Description: Python 2 package with corresponding Python 3 package
@@ -25,15 +23,4 @@ Description: Python 2 package with corresponding Python 3 package
things. It should not be installed like a regular package. It may
be an empty package.
.
- This is a Python 2 package with corresponding Python 3 package.
-
-Package: python3-{$source}-withpy3
-Architecture: all
-Depends: $\{misc:Depends\}, python3
-Description: Python 3 package with corresponding Python 2 package
- This is a test package designed to exercise some feature or tag of
- Lintian. It is part of the Lintian test suite and may do very odd
- things. It should not be installed like a regular package. It may
- be an empty package.
- .
- This is a Python 3 package with corresponding Python 2 package.
+ Python 3 variant.
diff --git a/t/tests/python-python2/desc b/t/tests/python-new-python2-package/desc
similarity index 55%
rename from t/tests/python-python2/desc
rename to t/tests/python-new-python2-package/desc
index a0e09a7..fa60550 100644
--- a/t/tests/python-python2/desc
+++ b/t/tests/python-new-python2-package/desc
@@ -1,9 +1,6 @@
-Testname: python-python2
+Testname: python-new-python2-package
Sequence: 6000
Version: 1.0
Description: Check various Python 2 issues
-Skeleton: pedantic
-Options: --pedantic -I -E
Test-For:
new-package-should-not-package-python2-module
- python-foo-but-no-python3-foo
diff --git a/t/tests/python-new-python2-package/tags b/t/tests/python-new-python2-package/tags
new file mode 100644
index 0000000..400f07a
--- /dev/null
+++ b/t/tests/python-new-python2-package/tags
@@ -0,0 +1 @@
+W: python-new-python2-package source: new-package-should-not-package-python2-module python-python-new-python2-package
diff --git a/t/tests/python-python2-no-python3-unrel/debian/debian/control.in b/t/tests/python-python2-no-python3-unrel/debian/debian/control.in
new file mode 100644
index 0000000..1f99a4c
--- /dev/null
+++ b/t/tests/python-python2-no-python3-unrel/debian/debian/control.in
@@ -0,0 +1,26 @@
+Source: {$source}
+Priority: extra
+Section: python
+Maintainer: {$author}
+Standards-Version: {$standards_version}
+Build-Depends: debhelper (>= 9)
+
+Package: python-{$source}
+Architecture: all
+Depends: $\{misc:Depends\}, python2.7
+Description: Python 2 package with no corresponding Python 3 package
+ This is a test package designed to exercise some feature or tag of
+ Lintian. It is part of the Lintian test suite and may do very odd
+ things. It should not be installed like a regular package. It may
+ be an empty package.
+
+Package: python3-{$source}
+Architecture: all
+Depends: $\{misc:Depends\}, python3
+Description: Python 2 package with no corresponding Python 3 package (Python 3)
+ This is a test package designed to exercise some feature or tag of
+ Lintian. It is part of the Lintian test suite and may do very odd
+ things. It should not be installed like a regular package. It may
+ be an empty package.
+ .
+ Python 3 package.
diff --git a/t/tests/python-python2-no-python3-unrel/desc b/t/tests/python-python2-no-python3-unrel/desc
new file mode 100644
index 0000000..fd36ee5
--- /dev/null
+++ b/t/tests/python-python2-no-python3-unrel/desc
@@ -0,0 +1,6 @@
+Testname: python-python2-no-python3-unrel
+Sequence: 6000
+Version: 1.0
+Description: Check for Python packages that only ship a Python 2.x module
+Test-Against:
+ python-foo-but-no-python3-foo
diff --git a/t/tests/python-python2-no-python3-unrel/tags b/t/tests/python-python2-no-python3-unrel/tags
new file mode 100644
index 0000000..e69de29
diff --git a/t/tests/python-python2-no-python3/debian/debian/control.in b/t/tests/python-python2-no-python3/debian/debian/control.in
new file mode 100644
index 0000000..73143d8
--- /dev/null
+++ b/t/tests/python-python2-no-python3/debian/debian/control.in
@@ -0,0 +1,15 @@
+Source: {$source}
+Priority: extra
+Section: python
+Maintainer: {$author}
+Standards-Version: {$standards_version}
+Build-Depends: debhelper (>= 9)
+
+Package: python-{$source}
+Architecture: all
+Depends: $\{misc:Depends\}, python2.7
+Description: Python 2 package with no corresponding Python 3 package
+ This is a test package designed to exercise some feature or tag of
+ Lintian. It is part of the Lintian test suite and may do very odd
+ things. It should not be installed like a regular package. It may
+ be an empty package.
diff --git a/t/tests/python-python2-no-python3/desc b/t/tests/python-python2-no-python3/desc
new file mode 100644
index 0000000..93dc876
--- /dev/null
+++ b/t/tests/python-python2-no-python3/desc
@@ -0,0 +1,6 @@
+Testname: python-python2-no-python3
+Sequence: 6000
+Version: 1.0
+Description: Check for Python packages that only ship a Python 2.x module
+Test-For:
+ python-foo-but-no-python3-foo
diff --git a/t/tests/python-python2-no-python3/tags b/t/tests/python-python2-no-python3/tags
new file mode 100644
index 0000000..c78012e
--- /dev/null
+++ b/t/tests/python-python2-no-python3/tags
@@ -0,0 +1 @@
+I: python-python2-no-python3 source: python-foo-but-no-python3-foo python-python-python2-no-python3
diff --git a/t/tests/python-python2/tags b/t/tests/python-python2/tags
deleted file mode 100644
index ef91ce0..0000000
--- a/t/tests/python-python2/tags
+++ /dev/null
@@ -1,3 +0,0 @@
-I: python-python2 source: python-foo-but-no-python3-foo python-python-python2-nopy3
-W: python-python2 source: new-package-should-not-package-python2-module python-python-python2-nopy3
-W: python-python2 source: new-package-should-not-package-python2-module python-python-python2-withpy3
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: