paulmataruso/tacticalrmm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix deprecated function

Browse Source
This commit is contained in:
wh1te909
2022-04-24 23:20:39 +00:00
parent b57fc8a29c
commit c03cd53853
8 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/tacticalrmm/accounts/tests.py
View File

@@ -338,7 +338,7 @@ class TestAPIKeyViews(TacticalTestCase):
resp = self.client.put(url, data, format="json")
self.assertEqual(resp.status_code, 200)
apikey = APIKey.objects.get(pk=apikey.pk)
self.assertEquals(apikey.name, "New Name")
self.assertEqual(apikey.name, "New Name")
self.check_not_authenticated("put", url)

76
api/tacticalrmm/alerts/tests.py
View File

@@ -70,8 +70,8 @@ class TestAlertsViews(TacticalTestCase):
data = {"top": 3}
resp = self.client.patch(url, data, format="json")
self.assertEqual(resp.status_code, 200)
self.assertEquals(resp.data["alerts"], AlertSerializer(alerts, many=True).data)
self.assertEquals(resp.data["alerts_count"], 10)
self.assertEqual(resp.data["alerts"], AlertSerializer(alerts, many=True).data)
self.assertEqual(resp.data["alerts_count"], 10)
# test filter data
# test data and result counts
@@ -409,15 +409,15 @@ class TestAlertTasks(TacticalTestCase):
core.server_policy = policy
core.save()
self.assertEquals(server.set_alert_template().pk, alert_templates[0].pk)
self.assertEquals(workstation.set_alert_template().pk, alert_templates[0].pk)
self.assertEqual(server.set_alert_template().pk, alert_templates[0].pk)
self.assertEqual(workstation.set_alert_template().pk, alert_templates[0].pk)
# assign second Alert Template to as default alert template
core.alert_template = alert_templates[1]
core.save()
self.assertEquals(workstation.set_alert_template().pk, alert_templates[1].pk)
self.assertEquals(server.set_alert_template().pk, alert_templates[1].pk)
self.assertEqual(workstation.set_alert_template().pk, alert_templates[1].pk)
self.assertEqual(server.set_alert_template().pk, alert_templates[1].pk)
# assign third Alert Template to client
workstation.client.alert_template = alert_templates[2]
@@ -425,8 +425,8 @@ class TestAlertTasks(TacticalTestCase):
workstation.client.save()
server.client.save()
self.assertEquals(workstation.set_alert_template().pk, alert_templates[2].pk)
self.assertEquals(server.set_alert_template().pk, alert_templates[2].pk)
self.assertEqual(workstation.set_alert_template().pk, alert_templates[2].pk)
self.assertEqual(server.set_alert_template().pk, alert_templates[2].pk)
# apply policy to client and should override
workstation.client.workstation_policy = policy
@@ -434,8 +434,8 @@ class TestAlertTasks(TacticalTestCase):
workstation.client.save()
server.client.save()
self.assertEquals(workstation.set_alert_template().pk, alert_templates[0].pk)
self.assertEquals(server.set_alert_template().pk, alert_templates[0].pk)
self.assertEqual(workstation.set_alert_template().pk, alert_templates[0].pk)
self.assertEqual(server.set_alert_template().pk, alert_templates[0].pk)
# assign fouth Alert Template to site
workstation.site.alert_template = alert_templates[3]
@@ -443,8 +443,8 @@ class TestAlertTasks(TacticalTestCase):
workstation.site.save()
server.site.save()
self.assertEquals(workstation.set_alert_template().pk, alert_templates[3].pk)
self.assertEquals(server.set_alert_template().pk, alert_templates[3].pk)
self.assertEqual(workstation.set_alert_template().pk, alert_templates[3].pk)
self.assertEqual(server.set_alert_template().pk, alert_templates[3].pk)
# apply policy to site
workstation.site.workstation_policy = policy
@@ -452,8 +452,8 @@ class TestAlertTasks(TacticalTestCase):
workstation.site.save()
server.site.save()
self.assertEquals(workstation.set_alert_template().pk, alert_templates[0].pk)
self.assertEquals(server.set_alert_template().pk, alert_templates[0].pk)
self.assertEqual(workstation.set_alert_template().pk, alert_templates[0].pk)
self.assertEqual(server.set_alert_template().pk, alert_templates[0].pk)
# apply policy to agents
workstation.policy = policy
@@ -461,35 +461,35 @@ class TestAlertTasks(TacticalTestCase):
workstation.save()
server.save()
self.assertEquals(workstation.set_alert_template().pk, alert_templates[0].pk)
self.assertEquals(server.set_alert_template().pk, alert_templates[0].pk)
self.assertEqual(workstation.set_alert_template().pk, alert_templates[0].pk)
self.assertEqual(server.set_alert_template().pk, alert_templates[0].pk)
# test disabling alert template
alert_templates[0].is_active = False
alert_templates[0].save()
self.assertEquals(workstation.set_alert_template().pk, alert_templates[3].pk)
self.assertEquals(server.set_alert_template().pk, alert_templates[3].pk)
self.assertEqual(workstation.set_alert_template().pk, alert_templates[3].pk)
self.assertEqual(server.set_alert_template().pk, alert_templates[3].pk)
# test policy exclusions
alert_templates[3].excluded_agents.set([workstation.pk])
self.assertEquals(workstation.set_alert_template().pk, alert_templates[2].pk)
self.assertEquals(server.set_alert_template().pk, alert_templates[3].pk)
self.assertEqual(workstation.set_alert_template().pk, alert_templates[2].pk)
self.assertEqual(server.set_alert_template().pk, alert_templates[3].pk)
# test workstation exclusions
alert_templates[2].exclude_workstations = True
alert_templates[2].save()
self.assertEquals(workstation.set_alert_template().pk, alert_templates[1].pk)
self.assertEquals(server.set_alert_template().pk, alert_templates[3].pk)
self.assertEqual(workstation.set_alert_template().pk, alert_templates[1].pk)
self.assertEqual(server.set_alert_template().pk, alert_templates[3].pk)
# test server exclusions
alert_templates[3].exclude_servers = True
alert_templates[3].save()
self.assertEquals(workstation.set_alert_template().pk, alert_templates[1].pk)
self.assertEquals(server.set_alert_template().pk, alert_templates[2].pk)
self.assertEqual(workstation.set_alert_template().pk, alert_templates[1].pk)
self.assertEqual(server.set_alert_template().pk, alert_templates[2].pk)
@patch("agents.tasks.sleep")
@patch("core.models.CoreSettings.send_mail")
@@ -523,7 +523,7 @@ class TestAlertTasks(TacticalTestCase):
# call outages task and no alert should be created
agent_outages_task()
self.assertEquals(Alert.objects.count(), 0)
self.assertEqual(Alert.objects.count(), 0)
# set overdue_dashboard_alert and alert should be created
agent_dashboard_alert.overdue_dashboard_alert = True
@@ -574,22 +574,22 @@ class TestAlertTasks(TacticalTestCase):
agent_outages_task()
# should have created 6 alerts
self.assertEquals(Alert.objects.count(), 6)
self.assertEqual(Alert.objects.count(), 6)
# other specific agents should have created alerts
self.assertEquals(Alert.objects.filter(agent=agent_dashboard_alert).count(), 1)
self.assertEquals(Alert.objects.filter(agent=agent_text_alert).count(), 1)
self.assertEquals(Alert.objects.filter(agent=agent_email_alert).count(), 1)
self.assertEquals(Alert.objects.filter(agent=agent_template_email).count(), 1)
self.assertEquals(
self.assertEqual(Alert.objects.filter(agent=agent_dashboard_alert).count(), 1)
self.assertEqual(Alert.objects.filter(agent=agent_text_alert).count(), 1)
self.assertEqual(Alert.objects.filter(agent=agent_email_alert).count(), 1)
self.assertEqual(Alert.objects.filter(agent=agent_template_email).count(), 1)
self.assertEqual(
Alert.objects.filter(agent=agent_template_dashboard).count(), 1
)
self.assertEquals(Alert.objects.filter(agent=agent_template_text).count(), 1)
self.assertEquals(Alert.objects.filter(agent=agent_template_blank).count(), 0)
self.assertEqual(Alert.objects.filter(agent=agent_template_text).count(), 1)
self.assertEqual(Alert.objects.filter(agent=agent_template_blank).count(), 0)
# check if email and text tasks were called
self.assertEquals(outage_email.call_count, 2)
self.assertEquals(outage_sms.call_count, 2)
self.assertEqual(outage_email.call_count, 2)
self.assertEqual(outage_sms.call_count, 2)
outage_sms.assert_any_call(
pk=Alert.objects.get(agent=agent_text_alert).pk, alert_interval=None
@@ -630,7 +630,7 @@ class TestAlertTasks(TacticalTestCase):
# calling agent outage task again shouldn't create duplicate alerts and won't send alerts
agent_outages_task()
self.assertEquals(Alert.objects.count(), 6)
self.assertEqual(Alert.objects.count(), 6)
# test periodic notification
# change email/text sent to sometime in the past
@@ -942,7 +942,7 @@ class TestAlertTasks(TacticalTestCase):
send_email.assert_not_called()
send_sms.assert_not_called()
self.assertEquals(
self.assertEqual(
Alert.objects.filter(assigned_check=check_template_email).count(), 1
)
@@ -1244,7 +1244,7 @@ class TestAlertTasks(TacticalTestCase):
send_email.assert_not_called()
send_sms.assert_not_called()
self.assertEquals(
self.assertEqual(
Alert.objects.filter(assigned_task=task_template_email).count(), 1
)

2
api/tacticalrmm/apiv3/tests.py
View File

@@ -62,7 +62,7 @@ class TestAPIv3(TacticalTestCase):
r = self.client.get(url)
self.assertEqual(r.status_code, 200)
self.assertEqual(r.data["check_interval"], 20)
self.assertEquals(len(r.data["checks"]), 2)
self.assertEqual(len(r.data["checks"]), 2)
url = "/api/v3/Maj34ACb324j234asdj2n34kASDjh34-DESKTOPTEST123/checkrunner/"
r = self.client.get(url)

20
api/tacticalrmm/automation/tests.py
View File

@@ -410,11 +410,11 @@ class TestPolicyTasks(TacticalTestCase):
)
self.assertEqual(resp.status_code, 200)
self.assertEquals(len(resp.data["server_clients"]), 1)
self.assertEquals(len(resp.data["server_sites"]), 0)
self.assertEquals(len(resp.data["workstation_clients"]), 1)
self.assertEquals(len(resp.data["workstation_sites"]), 0)
self.assertEquals(len(resp.data["agents"]), 0)
self.assertEqual(len(resp.data["server_clients"]), 1)
self.assertEqual(len(resp.data["server_sites"]), 0)
self.assertEqual(len(resp.data["workstation_clients"]), 1)
self.assertEqual(len(resp.data["workstation_sites"]), 0)
self.assertEqual(len(resp.data["agents"]), 0)
# Add Site to Policy
policy.server_sites.add(server_agents[10].site)
@@ -422,9 +422,9 @@ class TestPolicyTasks(TacticalTestCase):
resp = self.client.get(
f"/automation/policies/{policy.pk}/related/", format="json"
)
self.assertEquals(len(resp.data["server_sites"]), 1)
self.assertEquals(len(resp.data["workstation_sites"]), 1)
self.assertEquals(len(resp.data["agents"]), 0)
self.assertEqual(len(resp.data["server_sites"]), 1)
self.assertEqual(len(resp.data["workstation_sites"]), 1)
self.assertEqual(len(resp.data["agents"]), 0)
# Add Agent to Policy
policy.agents.add(server_agents[2])
@@ -432,7 +432,7 @@ class TestPolicyTasks(TacticalTestCase):
resp = self.client.get(
f"/automation/policies/{policy.pk}/related/", format="json"
)
self.assertEquals(len(resp.data["agents"]), 2)
self.assertEqual(len(resp.data["agents"]), 2)
def test_getting_agent_policy_checks(self):
@@ -442,7 +442,7 @@ class TestPolicyTasks(TacticalTestCase):
agent = baker.make_recipe("agents.agent", policy=policy)
# test policy assigned to agent
self.assertEquals(len(agent.get_checks_from_policies()), 7)
self.assertEqual(len(agent.get_checks_from_policies()), 7)
def test_getting_agent_policy_checks_with_enforced(self):
# setup data

12
api/tacticalrmm/checks/tests.py
View File

@@ -842,8 +842,8 @@ class TestCheckTasks(TacticalTestCase):
check_result = CheckResult.objects.get(assigned_check=check, agent=self.agent)
self.assertEquals(check.alert_severity, "warning")
self.assertEquals(check_result.status, "failing")
self.assertEqual(check.alert_severity, "warning")
self.assertEqual(check_result.status, "failing")
# test passing when contains
resp = self.client.patch(url, no_logs_data, format="json")
@@ -851,7 +851,7 @@ class TestCheckTasks(TacticalTestCase):
check_result = CheckResult.objects.get(assigned_check=check, agent=self.agent)
self.assertEquals(check_result.status, "passing")
self.assertEqual(check_result.status, "passing")
# test failing when not contains and message and source
check.fail_when = "not_contains"
@@ -863,8 +863,8 @@ class TestCheckTasks(TacticalTestCase):
check_result = CheckResult.objects.get(assigned_check=check, agent=self.agent)
self.assertEquals(check_result.status, "failing")
self.assertEquals(check.alert_severity, "error")
self.assertEqual(check_result.status, "failing")
self.assertEqual(check.alert_severity, "error")
# test passing when contains with source and message
resp = self.client.patch(url, data, format="json")
@@ -872,7 +872,7 @@ class TestCheckTasks(TacticalTestCase):
check_result = CheckResult.objects.get(assigned_check=check, agent=self.agent)
self.assertEquals(check_result.status, "passing")
self.assertEqual(check_result.status, "passing")
class TestCheckPermissions(TacticalTestCase):

4
api/tacticalrmm/scripts/tests.py
View File

@@ -80,7 +80,7 @@ class TestScriptViews(TacticalTestCase):
resp = self.client.put(url, data, format="json")
self.assertEqual(resp.status_code, 200)
script = Script.objects.get(pk=script.pk)
self.assertEquals(script.description, "Description Change")
self.assertEqual(script.description, "Description Change")
# correct_hash = hmac.new(
# settings.SECRET_KEY.encode(), data["script_body"].encode(), hashlib.sha256
@@ -467,7 +467,7 @@ class TestScriptSnippetViews(TacticalTestCase):
resp = self.client.put(url, data, format="json")
self.assertEqual(resp.status_code, 200)
snippet = ScriptSnippet.objects.get(pk=snippet.pk)
self.assertEquals(snippet.name, "New Name")
self.assertEqual(snippet.name, "New Name")
self.check_not_authenticated("put", url)

4
api/tacticalrmm/services/tests.py
View File

@@ -63,7 +63,7 @@ class TestServiceViews(TacticalTestCase):
resp = self.client.get(url, format="json")
self.assertEqual(resp.status_code, 200)
nats_cmd.assert_called_with(data={"func": "winservices"}, timeout=10)
self.assertEquals(Agent.objects.get(pk=agent.pk).services, nats_return)
self.assertEqual(Agent.objects.get(pk=agent.pk).services, nats_return)
self.check_not_authenticated("get", url)
@@ -141,7 +141,7 @@ class TestServiceViews(TacticalTestCase):
nats_cmd.assert_called_with(
{"func": "winsvcdetail", "payload": {"name": "alg"}}, timeout=10
)
self.assertEquals(resp.data, nats_return)
self.assertEqual(resp.data, nats_return)
self.check_not_authenticated("get", url)

4
api/tacticalrmm/software/tests.py
View File

@@ -42,7 +42,7 @@ class TestSoftwareViews(TacticalTestCase):
# test without agent software
resp = self.client.get(url, format="json")
self.assertEqual(resp.status_code, 200)
self.assertEquals(resp.data, [])
self.assertEqual(resp.data, [])
# make some software
software = baker.make(
@@ -60,7 +60,7 @@ class TestSoftwareViews(TacticalTestCase):
serializer = InstalledSoftwareSerializer([software], many=True)
resp = self.client.get(f"{base_url}/", format="json")
self.assertEqual(resp.status_code, 200)
self.assertEquals(resp.data, serializer.data)
self.assertEqual(resp.data, serializer.data)
self.check_not_authenticated("get", url)