jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/401630 )
Change subject: Migrate to pytest, remove some junk old tests
......................................................................
Migrate to pytest, remove some junk old tests
Change-Id: Ibdbfc128704b0e7309956c23ab86ff65988ed32c
---
M .gitignore
D make-release/tests/test_make-release-yaml.py
D make-release/tests/test_make-release.py
A make-release/tests/test_makerelease-yaml.py
M test-requirements.txt
M tox.ini
6 files changed, 15 insertions(+), 57 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitignore b/.gitignore
index 9cfc581..a05a315 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
local.conf
composer.lock
/vendor
+.cache
diff --git a/make-release/tests/test_make-release-yaml.py
b/make-release/tests/test_make-release-yaml.py
deleted file mode 100644
index a058784..0000000
--- a/make-release/tests/test_make-release-yaml.py
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import unittest
-import yaml
-
-
-class MakeReleaseYamlTest(unittest.TestCase):
- fname = os.path.join(
- os.path.dirname(os.path.dirname(__file__)),
- 'make-release.yaml'
- )
-
- def test_valid_syntax(self):
- with open(self.fname) as f:
- yaml.load(f)
-
- # No exception raised
- self.assertTrue(True)
diff --git a/make-release/tests/test_make-release.py
b/make-release/tests/test_make-release.py
deleted file mode 100644
index 0867f8f..0000000
--- a/make-release/tests/test_make-release.py
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env python2
-
-import unittest
-
-makerelease = __import__('makerelease')
-
-
-class Struct:
- def __init__(self, **entries):
- self.__dict__.update(entries)
-
-
-class MakeReleaseTest(unittest.TestCase):
- def getMakeRelease(self, options):
- if 'conffile' not in options:
- options['conffile'] = '../make-release.yaml'
- return makerelease.MakeRelease(Struct(**options))
-
- def test_get_extensions_for_version(self):
- mr = self.getMakeRelease({'version': '1.25.0'})
- # Added in 1.25
- self.assertIn('extensions/CiteThisPage',
- mr.get_extensions_for_version(mr.version))
-
- mr = self.getMakeRelease({'version': '1.23.0'})
- # Removed in 1.23
- self.assertNotIn('extensions/SimpleAntiSpam',
- mr.get_extensions_for_version(mr.version))
- # But if explicitly specified, still included
- self.assertIn(
- 'extensions/SimpleAntiSpam',
- mr.get_extensions_for_version(
- mr.version,
- ['extensions/SimpleAntiSpam']
- )
- )
diff --git a/make-release/tests/test_makerelease-yaml.py
b/make-release/tests/test_makerelease-yaml.py
new file mode 100644
index 0000000..f33790d
--- /dev/null
+++ b/make-release/tests/test_makerelease-yaml.py
@@ -0,0 +1,12 @@
+import os
+import yaml
+
+
+def test_valid_syntax():
+ fname = os.path.join(
+ os.path.dirname(os.path.dirname(__file__)),
+ 'make-release.yaml'
+ )
+
+ with open(fname) as conf:
+ yaml.load(conf)
diff --git a/test-requirements.txt b/test-requirements.txt
index f3c7e8e..e079f8a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1 +1 @@
-nose
+pytest
diff --git a/tox.ini b/tox.ini
index a9c2742..17c0b1b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,7 @@
setenv = VIRTUAL_ENV={envdir}
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
-commands = nosetests
+commands = py.test
[testenv:flake8]
commands = flake8
--
To view, visit https://gerrit.wikimedia.org/r/401630
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibdbfc128704b0e7309956c23ab86ff65988ed32c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
