Pytest instead of nose in unittest

Fixes: https://pagure.io/koji/issue/3140
This commit is contained in:
Jana Cupova 2021-12-02 10:02:45 +01:00 committed by Tomas Kopecek
parent bbaadef417
commit c310d6692d
34 changed files with 644 additions and 631 deletions

View file

@ -11,13 +11,13 @@ class TestInsertProcessor(unittest.TestCase):
proc = kojihub.InsertProcessor('sometable')
actual = str(proc)
expected = '-- incomplete update: no assigns'
self.assertEquals(actual, expected)
self.assertEqual(actual, expected)
def test_to_string_with_data(self):
proc = kojihub.InsertProcessor('sometable', data={'foo': 'bar'})
actual = str(proc)
expected = 'INSERT INTO sometable (foo) VALUES (%(foo)s)'
self.assertEquals(actual, expected)
self.assertEqual(actual, expected)
@mock.patch('kojihub.context')
def test_simple_execution_with_iterate(self, context):
@ -37,20 +37,20 @@ class TestInsertProcessor(unittest.TestCase):
context.session.assertLogin = mock.MagicMock()
proc = kojihub.InsertProcessor('sometable', data={'foo': 'bar'})
proc.make_create(event_id=1, user_id=2)
self.assertEquals(proc.data['create_event'], 1)
self.assertEquals(proc.data['creator_id'], 2)
self.assertEqual(proc.data['create_event'], 1)
self.assertEqual(proc.data['creator_id'], 2)
proc.make_create(user_id=2)
self.assertEquals(proc.data['create_event'], context.event_id)
self.assertEquals(proc.data['creator_id'], 2)
self.assertEqual(proc.data['create_event'], context.event_id)
self.assertEqual(proc.data['creator_id'], 2)
proc.make_create(event_id=1)
self.assertEquals(proc.data['create_event'], 1)
self.assertEquals(proc.data['creator_id'], context.session.user_id)
self.assertEqual(proc.data['create_event'], 1)
self.assertEqual(proc.data['creator_id'], context.session.user_id)
proc.make_create()
self.assertEquals(proc.data['create_event'], context.event_id)
self.assertEquals(proc.data['creator_id'], context.session.user_id)
self.assertEqual(proc.data['create_event'], context.event_id)
self.assertEqual(proc.data['creator_id'], context.session.user_id)
@mock.patch('kojihub.context')
def test_dup_check(self, context):
@ -63,7 +63,7 @@ class TestInsertProcessor(unittest.TestCase):
args = cursor.execute.call_args
actual = ' '.join(args[0][0].split())
expected = 'SELECT foo FROM sometable WHERE (foo = %(foo)s)'
self.assertEquals(actual, expected)
self.assertEqual(actual, expected)
proc.make_create()
proc.dup_check()
@ -71,12 +71,12 @@ class TestInsertProcessor(unittest.TestCase):
actual = ' '.join(args[0][0].split())
expected = 'SELECT active, foo FROM sometable WHERE ' + \
'(active = %(active)s) AND (foo = %(foo)s)'
self.assertEquals(actual, expected)
self.assertEqual(actual, expected)
proc.set(onething='another')
proc.rawset(something='something else')
result = proc.dup_check()
self.assertEquals(result, None)
self.assertEqual(result, None)
@mock.patch('kojihub.context')
def test_raw_data(self, context):
@ -84,10 +84,10 @@ class TestInsertProcessor(unittest.TestCase):
context.cnx.cursor.return_value = cursor
proc = kojihub.InsertProcessor('sometable', rawdata={'foo': '\'bar\''})
result = proc.dup_check()
self.assertEquals(result, None)
self.assertEqual(result, None)
actual = str(proc)
expected = "INSERT INTO sometable (foo) VALUES (('bar'))" # raw data
self.assertEquals(actual, expected)
self.assertEqual(actual, expected)
class TestBulkInsertProcessor(unittest.TestCase):
@ -95,18 +95,18 @@ class TestBulkInsertProcessor(unittest.TestCase):
proc = kojihub.BulkInsertProcessor('sometable')
actual = str(proc)
expected = '-- incomplete insert: no data'
self.assertEquals(actual, expected)
self.assertEqual(actual, expected)
def test_to_string_with_single_row(self):
proc = kojihub.BulkInsertProcessor('sometable', data=[{'foo': 'bar'}])
actual = str(proc)
expected = 'INSERT INTO sometable (foo) VALUES (%(foo0)s)'
self.assertEquals(actual, expected)
self.assertEqual(actual, expected)
proc = kojihub.BulkInsertProcessor('sometable')
proc.add_record(foo='bar')
actual = str(proc)
self.assertEquals(actual, expected)
self.assertEqual(actual, expected)
@mock.patch('kojihub.context')
def test_simple_execution(self, context):
@ -148,7 +148,7 @@ class TestBulkInsertProcessor(unittest.TestCase):
proc.add_record(foo2='bar2')
with self.assertRaises(koji.GenericError) as cm:
str(proc)
self.assertEquals(cm.exception.args[0], 'Missing value foo2 in BulkInsert')
self.assertEqual(cm.exception.args[0], 'Missing value foo2 in BulkInsert')
def test_missing_values_nostrict(self):
proc = kojihub.BulkInsertProcessor('sometable', strict=False)
@ -156,14 +156,14 @@ class TestBulkInsertProcessor(unittest.TestCase):
proc.add_record(foo2='bar2')
actual = str(proc)
expected = 'INSERT INTO sometable (foo, foo2) VALUES (%(foo0)s, NULL), (NULL, %(foo21)s)'
self.assertEquals(actual, expected)
self.assertEqual(actual, expected)
def test_missing_values_explicit_columns(self):
proc = kojihub.BulkInsertProcessor('sometable', strict=True, columns=['foo', 'foo2'])
proc.add_record(foo='bar')
with self.assertRaises(koji.GenericError) as cm:
str(proc)
self.assertEquals(cm.exception.args[0], 'Missing value foo2 in BulkInsert')
self.assertEqual(cm.exception.args[0], 'Missing value foo2 in BulkInsert')
@mock.patch('kojihub.context')
def test_batch_execution(self, context):
@ -176,15 +176,12 @@ class TestBulkInsertProcessor(unittest.TestCase):
proc.execute()
calls = cursor.execute.mock_calls
# list of (name, positional args, keyword args)
self.assertEquals(len(calls), 2)
self.assertEquals(
calls[0][1],
('INSERT INTO sometable (foo) VALUES (%(foo0)s), (%(foo1)s)',
{'foo0': 'bar1', 'foo1': 'bar2'}))
self.assertEquals(
calls[1][1],
('INSERT INTO sometable (foo) VALUES (%(foo0)s)',
{'foo0': 'bar3'}))
self.assertEqual(len(calls), 2)
self.assertEqual(calls[0][1],
('INSERT INTO sometable (foo) VALUES (%(foo0)s), (%(foo1)s)',
{'foo0': 'bar1', 'foo1': 'bar2'}))
self.assertEqual(calls[1][1],
('INSERT INTO sometable (foo) VALUES (%(foo0)s)', {'foo0': 'bar3'}))
@mock.patch('kojihub.context')
def test_no_batch_execution(self, context):
@ -197,8 +194,7 @@ class TestBulkInsertProcessor(unittest.TestCase):
proc.execute()
calls = cursor.execute.mock_calls
# list of (name, positional args, keyword args)
self.assertEquals(len(calls), 1)
self.assertEquals(
calls[0][1],
('INSERT INTO sometable (foo) VALUES (%(foo0)s), (%(foo1)s), (%(foo2)s)',
{'foo0': 'bar1', 'foo1': 'bar2', 'foo2': 'bar3'}))
self.assertEqual(len(calls), 1)
self.assertEqual(calls[0][1],
('INSERT INTO sometable (foo) VALUES (%(foo0)s), (%(foo1)s), (%(foo2)s)',
{'foo0': 'bar1', 'foo1': 'bar2', 'foo2': 'bar3'}))