Skip to content

[pull] master from bugy:master #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 10, 2025
Merged

[pull] master from bugy:master #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36bbf9e
migrate to `unittest.assertEqual`
emmanuel-ferdman May 9, 2025
23f2fac
migrate to `unittest.assertEqual`
bugy May 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/tests/execution_logging_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ def test_get_history_entries_only_for_current_user(self, user_id):
self.simulate_logging(execution_id='id4', user_id='userA')

entries = self._get_entries_sorted(user_id)
self.assertEquals(2, len(entries))
self.assertEqual(2, len(entries))

self.validate_history_entry(entry=entries[0], id='id1', user_id='userA')
self.validate_history_entry(entry=entries[1], id='id4', user_id='userA')
Expand All @@ -292,7 +292,7 @@ def test_get_history_entries_for_power_user(self):
self.simulate_logging(execution_id='id4', user_id='userA')

entries = self._get_entries_sorted('power_user')
self.assertEquals(4, len(entries))
self.assertEqual(4, len(entries))

self.validate_history_entry(entry=entries[0], id='id1', user_id='userA')
self.validate_history_entry(entry=entries[1], id='id2', user_id='userB')
Expand All @@ -306,7 +306,7 @@ def test_get_history_entries_for_system_call(self):
self.simulate_logging(execution_id='id4', user_id='userA')

entries = self._get_entries_sorted('some user', system_call=True)
self.assertEquals(4, len(entries))
self.assertEqual(4, len(entries))

self.validate_history_entry(entry=entries[0], id='id1', user_id='userA')
self.validate_history_entry(entry=entries[1], id='id2', user_id='userB')
Expand Down Expand Up @@ -357,7 +357,7 @@ def test_entry_with_user_id_name_different(self):
entry = self.logging_service.find_history_entry('id1', '192.168.2.12')
self.validate_history_entry(entry, id='id1', user_name='userX', user_id='192.168.2.12')

def test_find_entry_when_windows_line_seperator(self):
def test_find_entry_when_windows_line_separator(self):
self.simulate_logging(execution_id='id1', user_name='userX', user_id='192.168.2.12')
_replace_line_separators(self.get_log_files(), '\n', '\r\n')

Expand All @@ -381,7 +381,7 @@ def test_find_entry_when_another_user_and_no_entry(self):
entry = self.logging_service.find_history_entry('id2', 'userA')
self.assertIsNone(entry)

def test_find_log_when_windows_line_seperator(self):
def test_find_log_when_windows_line_separator(self):
self.simulate_logging(execution_id='id1', log_lines=['hello', 'wonderful', 'world'])
_replace_line_separators(self.get_log_files(), '\n', '\r\n')

Expand Down
10 changes: 5 additions & 5 deletions src/tests/model_helper_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,27 +552,27 @@ def test_default_value_when_empty_string(self):
class TestReadStrFromConfig(unittest.TestCase):
def test_normal_text(self):
value = read_str_from_config({'key1': 'xyz'}, 'key1')
self.assertEquals('xyz', value)
self.assertEqual('xyz', value)

def test_none_value_no_default(self):
value = read_str_from_config({'key1': None}, 'key1')
self.assertIsNone(value)

def test_none_value_with_default(self):
value = read_str_from_config({'key1': None}, 'key1', default='abc')
self.assertEquals('abc', value)
self.assertEqual('abc', value)

def test_no_key_no_default(self):
value = read_str_from_config({'key1': 'xyz'}, 'key2')
self.assertIsNone(value)

def test_no_key_with_default(self):
value = read_str_from_config({'key1': 'xyz'}, 'key2', default='abc')
self.assertEquals('abc', value)
self.assertEqual('abc', value)

def test_text_with_whitespaces(self):
value = read_str_from_config({'key1': ' xyz \n'}, 'key1')
self.assertEquals(' xyz \n', value)
self.assertEqual(' xyz \n', value)

def test_text_when_blank_to_none_and_none(self):
value = read_str_from_config({'key1': None}, 'key1', blank_to_none=True)
Expand All @@ -588,7 +588,7 @@ def test_text_when_blank_to_none_and_blank(self):

def test_text_when_blank_to_none_and_blank_and_default(self):
value = read_str_from_config({'key1': ' \t \n'}, 'key1', blank_to_none=True, default='abc')
self.assertEquals('abc', value)
self.assertEqual('abc', value)

def test_text_when_int(self):
self.assertRaisesRegex(InvalidValueTypeException, 'Invalid key1 value: string expected, but was: 5',
Expand Down
48 changes: 24 additions & 24 deletions src/tests/server_conf_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,8 @@ def test_google_oauth(self):
'allowed_users': []
}})
self.assertIsInstance(config.authenticator, GoogleOauthAuthenticator)
self.assertEquals('1234', config.authenticator.client_id)
self.assertEquals('abcd', config.authenticator.secret)
self.assertEqual('1234', config.authenticator.client_id)
self.assertEqual('abcd', config.authenticator.secret)

def test_google_oauth_without_allowed_users(self):
with self.assertRaisesRegex(Exception, 'access.allowed_users field is mandatory for google_oauth'):
Expand All @@ -272,10 +272,10 @@ def test_azure_ad_oauth(self):
'client_id': '1234',
'secret': 'abcd'}})
self.assertIsInstance(config.authenticator, AzureAdOAuthAuthenticator)
self.assertEquals('https://test.com/authorize', config.authenticator.auth_url)
self.assertEquals('https://test.com/token', config.authenticator.token_url)
self.assertEquals('1234', config.authenticator.client_id)
self.assertEquals('abcd', config.authenticator.secret)
self.assertEqual('https://test.com/authorize', config.authenticator.auth_url)
self.assertEqual('https://test.com/token', config.authenticator.token_url)
self.assertEqual('1234', config.authenticator.client_id)
self.assertEqual('abcd', config.authenticator.secret)

def test_gitlab_oauth(self):
config = _from_json({
Expand All @@ -297,18 +297,18 @@ def test_ldap(self):
'base_dn': 'dc=test',
'version': 3}})
self.assertIsInstance(config.authenticator, LdapAuthenticator)
self.assertEquals('http://test-ldap.net', config.authenticator.url)
self.assertEquals('|xyz|', config.authenticator.username_template.substitute(username='xyz'))
self.assertEquals('dc=test', config.authenticator._base_dn)
self.assertEquals(3, config.authenticator.version)
self.assertEqual('http://test-ldap.net', config.authenticator.url)
self.assertEqual('|xyz|', config.authenticator.username_template.substitute(username='xyz'))
self.assertEqual('dc=test', config.authenticator._base_dn)
self.assertEqual(3, config.authenticator.version)

def test_ldap_multiple_urls(self):
config = _from_json({'auth': {'type': 'ldap',
'url': ['http://test-ldap-1.net', 'http://test-ldap-2.net'],
'username_pattern': '|$username|'}})
self.assertIsInstance(config.authenticator, LdapAuthenticator)
self.assertEquals(['http://test-ldap-1.net', 'http://test-ldap-2.net'], config.authenticator.url)
self.assertEquals('|xyz|', config.authenticator.username_template.substitute(username='xyz'))
self.assertEqual(['http://test-ldap-1.net', 'http://test-ldap-2.net'], config.authenticator.url)
self.assertEqual('|xyz|', config.authenticator.username_template.substitute(username='xyz'))

def test_htpasswd_auth(self):
file = test_utils.create_file('some-path', text='user1:1yL79Q78yczsM')
Expand All @@ -332,7 +332,7 @@ class TestSecurityConfig(unittest.TestCase):
def test_default_config(self):
config = _from_json({})

self.assertEquals('token', config.xsrf_protection)
self.assertEqual('token', config.xsrf_protection)

@parameterized.expand([
('token',),
Expand All @@ -344,7 +344,7 @@ def test_xsrf_protection(self, xsrf_protection):
'xsrf_protection': xsrf_protection
}})

self.assertEquals(xsrf_protection, config.xsrf_protection)
self.assertEqual(xsrf_protection, config.xsrf_protection)

def test_xsrf_protection_when_unsupported(self):
self.assertRaises(InvalidValueException, _from_json, {'security': {
Expand Down Expand Up @@ -375,18 +375,18 @@ def tearDown(self):
def test_default_config(self):
config = _from_json({})
env_vars = config.env_vars.build_env_vars()
self.assertEquals(env_vars, os.environ)
self.assertEqual(env_vars, os.environ)

def test_config_when_safe_env_variables_used(self):
config = _from_json({'title': '$$VAR1', 'auth': {'type': 'ldap', 'url': '$$MY_SECRET'}})

env_vars = config.env_vars.build_env_vars()
self.assertEquals(env_vars, os.environ)
self.assertEqual(env_vars, os.environ)
self.assertEqual('abcd', env_vars['VAR1'])
self.assertEqual('qwerty', env_vars['MY_SECRET'])

self.assertEquals(config.title, '$$VAR1')
self.assertEquals(config.authenticator.url, '$$MY_SECRET')
self.assertEqual(config.title, '$$VAR1')
self.assertEqual(config.authenticator.url, '$$MY_SECRET')

def test_config_when_unsafe_env_variables_used(self):
config = _from_json({
Expand All @@ -410,18 +410,18 @@ def test_config_when_unsafe_env_variables_used(self):
self.assertNotIn('EMAIL_PWD', env_vars)
self.assertNotIn('EMAIL_PWD_2', env_vars)

self.assertEquals(config.title, '$$VAR1')
self.assertEquals(config.authenticator.secret, 'qwerty')
self.assertEqual(config.title, '$$VAR1')
self.assertEqual(config.authenticator.secret, 'qwerty')

alert_destinations = AlertsService(config.alerts_config)._communication_service._destinations
self.assertEquals(alert_destinations[0]._communicator.password, '1234509')
self.assertEquals(alert_destinations[1]._communicator.password, '$VAR2')
self.assertEqual(alert_destinations[0]._communicator.password, '1234509')
self.assertEqual(alert_destinations[1]._communicator.password, '$VAR2')

# noinspection PyTypeChecker
callback_feature = ExecutionsCallbackFeature(None, config.callbacks_config, None)
callback_destinations = callback_feature._communication_service._destinations
self.assertEquals(callback_destinations[0]._communicator.password, '007')
self.assertEquals(callback_destinations[1]._communicator.password, 'VAR1')
self.assertEqual(callback_destinations[0]._communicator.password, '007')
self.assertEqual(callback_destinations[1]._communicator.password, 'VAR1')

def create_email_destination(self, password):
return {'type': 'email',
Expand Down
2 changes: 1 addition & 1 deletion src/tests/web/server_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ def test_get_scripts_when_basic_auth_failure(self):
test_utils.write_script_config({'name': 's1'}, 's1', self.runners_folder)

response = requests.get('http://127.0.0.1:12345/scripts', auth=HTTPBasicAuth('normal_user', 'wrong_pass'))
self.assertEquals(401, response.status_code)
self.assertEqual(401, response.status_code)

@staticmethod
def get_xsrf_token(session):
Expand Down