alamin
/
djing
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix test

devel
Dmitry Novikov 8 years ago
parent
098a2719cb
commit
f92a0bf2f3
2 changed files with 36 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 43
      ip_pool/tests.py
  2. 26
      nas_app/tests.py

43
ip_pool/tests.py
View File

@ -2,8 +2,7 @@ from abc import ABCMeta
from django.conf import settings
from django.shortcuts import resolve_url
from django.test import TestCase
from django.utils.translation import gettext_lazy as _
from django.test import TestCase, override_settings
from accounts_app.models import UserProfile
from group_app.models import Group
@ -44,6 +43,7 @@ class NetworksTestCase(MyBaseTestCase, TestCase):
netw.groups.add(self.group.pk)
self.network = netw
@override_settings(LANGUAGE_CODE='en', LANGUAGES=(('en', 'English'),))
def test_add_network(self):
print('test_add_network')
url = resolve_url('ip_pool:net_add')
@ -57,32 +57,32 @@ class NetworksTestCase(MyBaseTestCase, TestCase):
'ip_start': '192.168.23.2',
'ip_end': '192.168.24.254'
})
self.assertFormError(r, form='form', field='ip_end', errors=_('End ip must be in subnet of specified network'))
self.assertFormError(r, form='form', field='ip_end', errors='End ip must be in subnet of specified network')
# Invalid ip
r = self.client.post(url, data={
'network': '192.168.23.0/24',
'kind': 'inet',
'description': 'SomeDescr',
'groups': ('1',),
'groups': (self.group.pk,),
'ip_start': '192.168.23.2',
'ip_end': '192.168.23.g'
})
self.assertFormError(r, form='form', field='ip_end', errors=_('Enter a valid IPv4 or IPv6 address.'))
self.assertFormError(r, form='form', field='ip_end', errors='Enter a valid IPv4 or IPv6 address.')
# Not existed group
r = self.client.post(url, data={
'network': '192.168.23.0/24',
'kind': 'inet',
'description': 'SomeDescr',
'groups': ('2',),
'groups': ('123',), # Not existed group id
'ip_start': '192.168.23.2',
'ip_end': '192.168.23.6'
})
self.assertFormError(
r, form='form', field='groups',
errors=_('Select a valid choice. %(value)s is not one of the available choices.') % {
'value': 2
errors='Select a valid choice. %(value)s is not one of the available choices.' % {
'value': 123 # Not existed group id
}
)
@ -91,19 +91,20 @@ class NetworksTestCase(MyBaseTestCase, TestCase):
'network': '192.168.12.0/24',
'kind': 'inet',
'description': 'SomeDescr',
'groups': ('1',),
'groups': (self.group.pk,),
'ip_start': '192.168.12.2',
'ip_end': '192.168.12.254'
})
self.assertRedirects(r, resolve_url('ip_pool:net_edit', 2))
created_network = NetworkModel.objects.get(pk=2)
self.assertEqual('192.168.12.0/24', str(created_network.network))
self.assertEqual('inet', created_network.kind)
self.assertEqual('SomeDescr', created_network.description)
self.assertEqual(1, created_network.groups.all().first().pk)
self.assertEqual('192.168.12.2', str(created_network.ip_start))
self.assertEqual('192.168.12.254', str(created_network.ip_end))
added_net = NetworkModel.objects.get(description='SomeDescr', network='192.168.12.0/24', kind='inet')
self.assertRedirects(r, resolve_url('ip_pool:net_edit', added_net.pk))
self.assertEqual('192.168.12.0/24', str(added_net.network))
self.assertEqual('inet', added_net.kind)
self.assertEqual('SomeDescr', added_net.description)
self.assertEqual(self.group.pk, added_net.groups.all().first().pk)
self.assertEqual('192.168.12.2', str(added_net.ip_start))
self.assertEqual('192.168.12.254', str(added_net.ip_end))
@override_settings(LANGUAGE_CODE='en', LANGUAGES=(('en', 'English'),))
def test_edit_network(self):
print('test_edit_network')
url = resolve_url('ip_pool:net_edit', net_id=self.network.pk)
@ -112,16 +113,16 @@ class NetworksTestCase(MyBaseTestCase, TestCase):
'network': '192.168.0.0/24',
'kind': 'guest',
'description': 'Описание',
'groups': ('1',),
'groups': (self.group.pk,),
'ip_start': '192.168.0.2',
'ip_end': '192.168.0.254'
})
self.assertRedirects(r, resolve_url('ip_pool:net_edit', 1))
updated_network = NetworkModel.objects.get(pk=1)
self.assertRedirects(r, resolve_url('ip_pool:net_edit', self.network.pk))
updated_network = NetworkModel.objects.get(pk=self.network.pk)
self.assertEqual('192.168.0.0/24', str(updated_network.network))
self.assertEqual('guest', updated_network.kind)
self.assertEqual('Описание', updated_network.description)
self.assertEqual(1, updated_network.groups.all().first().pk)
self.assertEqual(self.group.pk, updated_network.groups.all().first().pk)
self.assertEqual('192.168.0.2', str(updated_network.ip_start))
self.assertEqual('192.168.0.254', str(updated_network.ip_end))

26
nas_app/tests.py
View File

@ -3,9 +3,8 @@ from abc import ABCMeta
from abonapp.models import Abon
from accounts_app.models import UserProfile
from django.conf import settings
from django.utils.translation import gettext_lazy as _, gettext
from django.shortcuts import resolve_url
from django.test import TestCase
from django.test import TestCase, override_settings
from group_app.models import Group
from nas_app.models import NASModel
from nas_app.nas_managers import MikrotikTransmitter
@ -54,6 +53,7 @@ class NASModelTestCase(MyBaseTestCase, TestCase):
)
self.nas = nas
@override_settings(LANGUAGE_CODE='en', LANGUAGES=(('en', 'English'),))
def test_create(self):
url = resolve_url('nas_app:add')
self._client_get_check_login(url)
@ -69,7 +69,7 @@ class NASModelTestCase(MyBaseTestCase, TestCase):
})
self.assertEqual(r.status_code, 302)
msg = r.cookies.get('messages')
self.assertIn(gettext('New NAS has been created'), msg.output())
self.assertIn('New NAS has been created', msg.output())
NASModel.objects.get(title='Test success nas', ip_address='192.168.8.10', ip_port=1254,
auth_login='_', auth_passw='_')
@ -83,7 +83,7 @@ class NASModelTestCase(MyBaseTestCase, TestCase):
})
self.assertEqual(r.status_code, 200)
self.assertFormError(response=r, form='form', field='ip_port',
errors=_('Ensure this value is less than or equal to %(limit_value)s.') % {
errors='Ensure this value is less than or equal to %(limit_value)s.' % {
'limit_value': 65535
})
@ -101,7 +101,7 @@ class NASModelTestCase(MyBaseTestCase, TestCase):
})
self.assertEqual(r.status_code, 200)
self.assertFormError(response=r, form='form', field='title',
errors=_('%(model_name)s with this %(field_label)s already exists.') % {
errors='%(model_name)s with this %(field_label)s already exists.' % {
'model_name': NASModel._meta.verbose_name,
'field_label': NASModel._meta.get_field('title').verbose_name
})
@ -116,7 +116,7 @@ class NASModelTestCase(MyBaseTestCase, TestCase):
'default': True
})
self.assertEqual(r.status_code, 200)
self.assertFormError(response=r, form='form', field='default', errors=_('Can be only one default gateway'))
self.assertFormError(response=r, form='form', field='default', errors='Can be only one default gateway')
# test error duplicates ip_address
r = self.client.post(url, data={
@ -128,13 +128,14 @@ class NASModelTestCase(MyBaseTestCase, TestCase):
})
self.assertEqual(r.status_code, 200)
self.assertFormError(response=r, form='form', field='ip_address',
errors=_('%(model_name)s with this %(field_label)s already exists.') % {
errors='%(model_name)s with this %(field_label)s already exists.' % {
'model_name': NASModel._meta.verbose_name,
'field_label': NASModel._meta.get_field('ip_address').verbose_name
})
@override_settings(LANGUAGE_CODE='en', LANGUAGES=(('en', 'English'),))
def test_change(self):
url = resolve_url('nas_app:edit', 1)
url = resolve_url('nas_app:edit', self.nas.pk)
self._client_get_check_login(url)
# test get request
@ -149,12 +150,13 @@ class NASModelTestCase(MyBaseTestCase, TestCase):
'auth_passw': '_v_c',
'nas_type': 'mktk'
})
self.assertRedirects(r, resolve_url('nas_app:edit', 1))
self.assertRedirects(r, resolve_url('nas_app:edit', self.nas.pk))
msg = r.cookies.get('messages')
self.assertIn(gettext('Update successfully'), msg.output())
self.assertIn('Update successfully', msg.output())
NASModel.objects.get(title='New again nas2 changed', ip_address='192.168.8.12',
ip_port=7865, auth_login='_w_c', auth_passw='_v_c')
@override_settings(LANGUAGE_CODE='en', LANGUAGES=(('en', 'English'),))
def test_delete(self):
url = resolve_url('nas_app:add')
self._client_get_check_login(url)
@ -179,7 +181,7 @@ class NASModelTestCase(MyBaseTestCase, TestCase):
r = self.client.post(url)
self.assertRedirects(r, resolve_url('nas_app:home'))
msg = r.cookies.get('messages')
self.assertIn(gettext('Server successfully removed'), msg.output())
self.assertIn('Server successfully removed', msg.output())
try:
NASModel.objects.get(title='Test success nas_2')
raise self.failureException("NAS not removed")
@ -191,7 +193,7 @@ class NASModelTestCase(MyBaseTestCase, TestCase):
r = self.client.post(resolve_url('nas_app:del', nas_id))
self.assertRedirects(r, expected_url=resolve_url('nas_app:edit', nas_id))
msg = r.cookies.get('messages')
self.assertIn(gettext('You cannot remove default server'), msg.output())
self.assertIn('You cannot remove default server', msg.output())
def test_get_nas_manager(self):
r = self.nas.get_nas_manager_klass()

Write Preview
Loading…
Cancel
Save