This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit f6933a041901861e526b44af6fc974b29b33982e
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Fri Dec 16 12:29:57 2022 -0600
convert cqlshlib from nose to pytest
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18088
---
pylib/cassandra-cqlsh-tests.sh | 2 +-
pylib/cqlshlib/test/cassconnect.py | 6 +++---
pylib/cqlshlib/test/test_sslhandling.py | 8 ++++----
pylib/pytest.ini | 2 ++
pylib/requirements.txt | 3 +--
5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/pylib/cassandra-cqlsh-tests.sh b/pylib/cassandra-cqlsh-tests.sh
index 2b14941856..f039ba8cf8 100755
--- a/pylib/cassandra-cqlsh-tests.sh
+++ b/pylib/cassandra-cqlsh-tests.sh
@@ -129,7 +129,7 @@ ccm start --wait-for-binary-proto
cd ${CASSANDRA_DIR}/pylib/cqlshlib/
set +e # disable immediate exit from this point
-nosetests
+pytest
RETURN="$?"
ccm remove
diff --git a/pylib/cqlshlib/test/cassconnect.py
b/pylib/cqlshlib/test/cassconnect.py
index c4eae0ec8a..909e88ae62 100644
--- a/pylib/cqlshlib/test/cassconnect.py
+++ b/pylib/cqlshlib/test/cassconnect.py
@@ -20,7 +20,7 @@ import io
import os.path
import random
import string
-from nose.tools import nottest
+import pytest
from .basecase import TEST_HOST, TEST_PORT, cql, cqlsh, cqlshlog, policy,
quote_name, test_dir
from .run_cqlsh import run_cqlsh, call_cqlsh
@@ -152,7 +152,7 @@ def cql_rule_set():
class DEFAULTVAL: pass
-@nottest
+@pytest.mark.skip(reason="not a test")
def testrun_cqlsh(keyspace=DEFAULTVAL, **kwargs):
# use a positive default sentinel so that keyspace=None can be used
# to override the default behavior
@@ -161,7 +161,7 @@ def testrun_cqlsh(keyspace=DEFAULTVAL, **kwargs):
return run_cqlsh(keyspace=keyspace, **kwargs)
-@nottest
+@pytest.mark.skip(reason="not a test")
def testcall_cqlsh(keyspace=None, **kwargs):
if keyspace is None:
keyspace = get_keyspace()
diff --git a/pylib/cqlshlib/test/test_sslhandling.py
b/pylib/cqlshlib/test/test_sslhandling.py
index 347fe2a114..a96089d866 100644
--- a/pylib/cqlshlib/test/test_sslhandling.py
+++ b/pylib/cqlshlib/test/test_sslhandling.py
@@ -17,11 +17,11 @@
from cassandra.policies import SimpleConvictionPolicy
from cassandra.pool import Host
from cqlshlib.sslhandling import ssl_settings
-from nose.tools import assert_raises
import unittest
import os
import ssl
+import pytest
class SslSettingsTest(unittest.TestCase):
@@ -53,7 +53,7 @@ class SslSettingsTest(unittest.TestCase):
def test_invalid_ssl_versions_from_env(self):
msg = "invalid_ssl is not a valid SSL protocol, please use one of
TLSv1, TLSv1_1, or TLSv1_2"
- with assert_raises(SystemExit) as error:
+ with pytest.raises(SystemExit) as error:
self._test_ssl_version_from_env('invalid_ssl')
assert msg == error.exception.message
@@ -69,7 +69,7 @@ class SslSettingsTest(unittest.TestCase):
def test_invalid_ssl_version_config(self):
msg = "invalid_ssl is not a valid SSL protocol, please use one of
TLSv1, TLSv1_1, or TLSv1_2"
- with assert_raises(SystemExit) as error:
+ with pytest.raises(SystemExit) as error:
ssl_settings(self.host, os.path.join('test', 'config',
'sslhandling_invalid.config'))
assert msg in error.exception.message
-
\ No newline at end of file
+
diff --git a/pylib/pytest.ini b/pylib/pytest.ini
new file mode 100644
index 0000000000..d360f07d68
--- /dev/null
+++ b/pylib/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+addopts = --junit-xml=nosetests.xml
diff --git a/pylib/requirements.txt b/pylib/requirements.txt
index 59ff479456..8788690638 100644
--- a/pylib/requirements.txt
+++ b/pylib/requirements.txt
@@ -11,8 +11,7 @@ docopt
enum34
flaky
mock
-nose
-nose-test-select
+pytest
parse
pycodestyle
psutil
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
