NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-27 01:36:11 -06:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

adjust tests to reflect the fact that we no longer remove the staged changes on apply (preserve the history)

Browse Source
This commit is contained in:
rmanyari 2023-03-15 14:09:14 -06:00
parent a6cc7feaa8
commit 37c7eb4a67
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
netbox/netbox/tests/test_staging.py
View File

@ -73,7 +73,7 @@ class StagingTestCase(TransactionTestCase):
circuit = Circuit.objects.get(cid='Circuit D1') circuit = Circuit.objects.get(cid='Circuit D1')
self.assertListEqual(list(circuit.tags.all()), list(tags)) self.assertListEqual(list(circuit.tags.all()), list(tags))
# Verify that changes are applied and deleted upon branch merge # Verify that changes are applied.
branch.merge() branch.merge()
self.assertEqual(Provider.objects.count(), 4) self.assertEqual(Provider.objects.count(), 4)
self.assertEqual(Circuit.objects.count(), 10) self.assertEqual(Circuit.objects.count(), 10)
@ -81,7 +81,7 @@ class StagingTestCase(TransactionTestCase):
self.assertListEqual(list(provider.asns.all()), list(asns)) self.assertListEqual(list(provider.asns.all()), list(asns))
circuit = Circuit.objects.get(cid='Circuit D1') circuit = Circuit.objects.get(cid='Circuit D1')
self.assertListEqual(list(circuit.tags.all()), list(tags)) self.assertListEqual(list(circuit.tags.all()), list(tags))
self.assertEqual(StagedChange.objects.count(), 0) self.assertEqual(StagedChange.objects.count(), 5)
def test_object_modification(self): def test_object_modification(self):
branch = Branch.objects.create(name='Branch 1') branch = Branch.objects.create(name='Branch 1')
@ -128,7 +128,7 @@ class StagingTestCase(TransactionTestCase):
self.assertEqual(circuit.cid, 'Circuit X') self.assertEqual(circuit.cid, 'Circuit X')
self.assertListEqual(list(circuit.tags.all()), list(tags)) self.assertListEqual(list(circuit.tags.all()), list(tags))
# Verify that changes are applied and deleted upon branch merge # Verify that changes are applied.
branch.merge() branch.merge()
self.assertEqual(Provider.objects.count(), 3) self.assertEqual(Provider.objects.count(), 3)
self.assertEqual(Provider.objects.get(pk=provider.pk).name, 'Provider X') self.assertEqual(Provider.objects.get(pk=provider.pk).name, 'Provider X')
@ -138,7 +138,7 @@ class StagingTestCase(TransactionTestCase):
circuit = Circuit.objects.get(pk=circuit.pk) circuit = Circuit.objects.get(pk=circuit.pk)
self.assertEqual(circuit.cid, 'Circuit X') self.assertEqual(circuit.cid, 'Circuit X')
self.assertListEqual(list(circuit.tags.all()), list(tags)) self.assertListEqual(list(circuit.tags.all()), list(tags))
self.assertEqual(StagedChange.objects.count(), 0) self.assertEqual(StagedChange.objects.count(), 5)
def test_object_deletion(self): def test_object_deletion(self):
branch = Branch.objects.create(name='Branch 1') branch = Branch.objects.create(name='Branch 1')
@ -162,11 +162,11 @@ class StagingTestCase(TransactionTestCase):
self.assertEqual(Provider.objects.count(), 2) self.assertEqual(Provider.objects.count(), 2)
self.assertEqual(Circuit.objects.count(), 6) self.assertEqual(Circuit.objects.count(), 6)
# Verify that changes are applied and deleted upon branch merge # Verify that changes are applied.
branch.merge() branch.merge()
self.assertEqual(Provider.objects.count(), 2) self.assertEqual(Provider.objects.count(), 2)
self.assertEqual(Circuit.objects.count(), 6) self.assertEqual(Circuit.objects.count(), 6)
self.assertEqual(StagedChange.objects.count(), 0) self.assertEqual(StagedChange.objects.count(), 4)
def test_exit_enter_context(self): def test_exit_enter_context(self):
branch = Branch.objects.create(name='Branch 1') branch = Branch.objects.create(name='Branch 1')