summaryrefslogtreecommitdiff
path: root/setuptools/tests
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2015-01-02 10:50:17 -0500
committerJason R. Coombs <jaraco@jaraco.com>2015-01-02 10:50:17 -0500
commit6fbf8f8eb100b60155ace52aaad3eee076e690f0 (patch)
tree81b13b87069a1a9e8bfc58399f51b5201e8cba2f /setuptools/tests
parent30f3068b7429f401bcbf1955de8fa370f3f8c8b0 (diff)
downloadpython-setuptools-git-6fbf8f8eb100b60155ace52aaad3eee076e690f0.tar.gz
Use simple assertions and pytest runner for test_markerlib.
Diffstat (limited to 'setuptools/tests')
-rw-r--r--setuptools/tests/test_markerlib.py51
1 files changed, 25 insertions, 26 deletions
diff --git a/setuptools/tests/test_markerlib.py b/setuptools/tests/test_markerlib.py
index 0cb9e70a..8197b49d 100644
--- a/setuptools/tests/test_markerlib.py
+++ b/setuptools/tests/test_markerlib.py
@@ -1,10 +1,9 @@
import os
-import unittest
import pytest
-class TestMarkerlib(unittest.TestCase):
+class TestMarkerlib:
@pytest.mark.importorskip('ast')
def test_markers(self):
@@ -12,32 +11,32 @@ class TestMarkerlib(unittest.TestCase):
os_name = os.name
- self.assertTrue(interpret(""))
-
- self.assertTrue(interpret("os.name != 'buuuu'"))
- self.assertTrue(interpret("os_name != 'buuuu'"))
- self.assertTrue(interpret("python_version > '1.0'"))
- self.assertTrue(interpret("python_version < '5.0'"))
- self.assertTrue(interpret("python_version <= '5.0'"))
- self.assertTrue(interpret("python_version >= '1.0'"))
- self.assertTrue(interpret("'%s' in os.name" % os_name))
- self.assertTrue(interpret("'%s' in os_name" % os_name))
- self.assertTrue(interpret("'buuuu' not in os.name"))
-
- self.assertFalse(interpret("os.name == 'buuuu'"))
- self.assertFalse(interpret("os_name == 'buuuu'"))
- self.assertFalse(interpret("python_version < '1.0'"))
- self.assertFalse(interpret("python_version > '5.0'"))
- self.assertFalse(interpret("python_version >= '5.0'"))
- self.assertFalse(interpret("python_version <= '1.0'"))
- self.assertFalse(interpret("'%s' not in os.name" % os_name))
- self.assertFalse(interpret("'buuuu' in os.name and python_version >= '5.0'"))
- self.assertFalse(interpret("'buuuu' in os_name and python_version >= '5.0'"))
+ assert interpret("")
+
+ assert interpret("os.name != 'buuuu'")
+ assert interpret("os_name != 'buuuu'")
+ assert interpret("python_version > '1.0'")
+ assert interpret("python_version < '5.0'")
+ assert interpret("python_version <= '5.0'")
+ assert interpret("python_version >= '1.0'")
+ assert interpret("'%s' in os.name" % os_name)
+ assert interpret("'%s' in os_name" % os_name)
+ assert interpret("'buuuu' not in os.name")
+
+ assert not interpret("os.name == 'buuuu'")
+ assert not interpret("os_name == 'buuuu'")
+ assert not interpret("python_version < '1.0'")
+ assert not interpret("python_version > '5.0'")
+ assert not interpret("python_version >= '5.0'")
+ assert not interpret("python_version <= '1.0'")
+ assert not interpret("'%s' not in os.name" % os_name)
+ assert not interpret("'buuuu' in os.name and python_version >= '5.0'")
+ assert not interpret("'buuuu' in os_name and python_version >= '5.0'")
environment = default_environment()
environment['extra'] = 'test'
- self.assertTrue(interpret("extra == 'test'", environment))
- self.assertFalse(interpret("extra == 'doc'", environment))
+ assert interpret("extra == 'test'", environment)
+ assert not interpret("extra == 'doc'", environment)
def raises_nameError():
try:
@@ -60,5 +59,5 @@ class TestMarkerlib(unittest.TestCase):
raises_syntaxError()
statement = "python_version == '5'"
- self.assertEqual(compile(statement).__doc__, statement)
+ assert compile(statement).__doc__ == statement