diff options
| -rw-r--r-- | releng/__init__.py (renamed from isotests/__init__.py) | 0 | ||||
| -rw-r--r-- | releng/admin.py (renamed from isotests/admin.py) | 0 | ||||
| -rw-r--r-- | releng/fixtures/architecture.json (renamed from isotests/fixtures/architecture.json) | 8 | ||||
| -rw-r--r-- | releng/fixtures/bootloaders.json (renamed from isotests/fixtures/bootloaders.json) | 6 | ||||
| -rw-r--r-- | releng/fixtures/boottype.json (renamed from isotests/fixtures/boottype.json) | 6 | ||||
| -rw-r--r-- | releng/fixtures/clockchoices.json (renamed from isotests/fixtures/clockchoices.json) | 6 | ||||
| -rw-r--r-- | releng/fixtures/filesystems.json (renamed from isotests/fixtures/filesystems.json) | 6 | ||||
| -rw-r--r-- | releng/fixtures/hardware.json (renamed from isotests/fixtures/hardware.json) | 12 | ||||
| -rw-r--r-- | releng/fixtures/installtype.json (renamed from isotests/fixtures/installtype.json) | 8 | ||||
| -rw-r--r-- | releng/fixtures/isotypes.json (renamed from isotests/fixtures/isotypes.json) | 4 | ||||
| -rw-r--r-- | releng/fixtures/modules.json (renamed from isotests/fixtures/modules.json) | 24 | ||||
| -rw-r--r-- | releng/fixtures/source.json (renamed from isotests/fixtures/source.json) | 6 | ||||
| -rw-r--r-- | releng/management/__init__.py (renamed from isotests/management/__init__.py) | 0 | ||||
| -rw-r--r-- | releng/management/commands/__init__.py (renamed from isotests/management/commands/__init__.py) | 0 | ||||
| -rw-r--r-- | releng/management/commands/syncisos.py (renamed from isotests/management/commands/syncisos.py) | 2 | ||||
| -rw-r--r-- | releng/models.py (renamed from isotests/models.py) | 4 | ||||
| -rw-r--r-- | releng/urls.py (renamed from isotests/urls.py) | 2 | ||||
| -rw-r--r-- | releng/views.py (renamed from isotests/views.py) | 10 | ||||
| -rw-r--r-- | settings.py | 2 | ||||
| -rw-r--r-- | templates/releng/add.html (renamed from templates/isotests/add.html) | 0 | ||||
| -rw-r--r-- | templates/releng/result_list.html (renamed from templates/isotests/result_list.html) | 0 | ||||
| -rw-r--r-- | templates/releng/result_section.html (renamed from templates/isotests/result_section.html) | 0 | ||||
| -rw-r--r-- | templates/releng/results.html (renamed from templates/isotests/results.html) | 2 | ||||
| -rw-r--r-- | templates/releng/thanks.html (renamed from templates/isotests/thanks.html) | 0 | ||||
| -rw-r--r-- | urls.py | 2 |
25 files changed, 55 insertions, 55 deletions
diff --git a/isotests/__init__.py b/releng/__init__.py index e69de29b..e69de29b 100644 --- a/isotests/__init__.py +++ b/releng/__init__.py diff --git a/isotests/admin.py b/releng/admin.py index 10acaa98..10acaa98 100644 --- a/isotests/admin.py +++ b/releng/admin.py diff --git a/isotests/fixtures/architecture.json b/releng/fixtures/architecture.json index a21100ba..0bf9b8bf 100644 --- a/isotests/fixtures/architecture.json +++ b/releng/fixtures/architecture.json @@ -1,28 +1,28 @@ [ { "pk": 1, - "model": "isotests.architecture", + "model": "releng.architecture", "fields": { "name": "dual, option i686" } }, { "pk": 2, - "model": "isotests.architecture", + "model": "releng.architecture", "fields": { "name": "dual, option x86_64" } }, { "pk": 3, - "model": "isotests.architecture", + "model": "releng.architecture", "fields": { "name": "i686" } }, { "pk": 4, - "model": "isotests.architecture", + "model": "releng.architecture", "fields": { "name": "x86_64" } diff --git a/isotests/fixtures/bootloaders.json b/releng/fixtures/bootloaders.json index 545b5c0c..bee02f2b 100644 --- a/isotests/fixtures/bootloaders.json +++ b/releng/fixtures/bootloaders.json @@ -1,21 +1,21 @@ [ { "pk": 1, - "model": "isotests.bootloader", + "model": "releng.bootloader", "fields": { "name": "grub" } }, { "pk": 2, - "model": "isotests.bootloader", + "model": "releng.bootloader", "fields": { "name": "syslinux" } }, { "pk": 3, - "model": "isotests.bootloader", + "model": "releng.bootloader", "fields": { "name": "other/manual" } diff --git a/isotests/fixtures/boottype.json b/releng/fixtures/boottype.json index 5d87ef15..ed4636eb 100644 --- a/isotests/fixtures/boottype.json +++ b/releng/fixtures/boottype.json @@ -1,21 +1,21 @@ [ { "pk": 1, - "model": "isotests.boottype", + "model": "releng.boottype", "fields": { "name": "optical" } }, { "pk": 2, - "model": "isotests.boottype", + "model": "releng.boottype", "fields": { "name": "usb" } }, { "pk": 3, - "model": "isotests.boottype", + "model": "releng.boottype", "fields": { "name": "pxe" } diff --git a/isotests/fixtures/clockchoices.json b/releng/fixtures/clockchoices.json index 6dfd06e1..f328801a 100644 --- a/isotests/fixtures/clockchoices.json +++ b/releng/fixtures/clockchoices.json @@ -1,21 +1,21 @@ [ { "pk": 1, - "model": "isotests.clockchoice", + "model": "releng.clockchoice", "fields": { "name": "unchanged" } }, { "pk": 2, - "model": "isotests.clockchoice", + "model": "releng.clockchoice", "fields": { "name": "configured manually" } }, { "pk": 3, - "model": "isotests.clockchoice", + "model": "releng.clockchoice", "fields": { "name": "NTP" } diff --git a/isotests/fixtures/filesystems.json b/releng/fixtures/filesystems.json index 5386c391..208f5c73 100644 --- a/isotests/fixtures/filesystems.json +++ b/releng/fixtures/filesystems.json @@ -1,21 +1,21 @@ [ { "pk": 1, - "model": "isotests.filesystem", + "model": "releng.filesystem", "fields": { "name": "autoprepare" } }, { "pk": 2, - "model": "isotests.filesystem", + "model": "releng.filesystem", "fields": { "name": "manual" } }, { "pk": 3, - "model": "isotests.filesystem", + "model": "releng.filesystem", "fields": { "name": "from config file" } diff --git a/isotests/fixtures/hardware.json b/releng/fixtures/hardware.json index 335a50f6..a2bb9ec0 100644 --- a/isotests/fixtures/hardware.json +++ b/releng/fixtures/hardware.json @@ -1,42 +1,42 @@ [ { "pk": 1, - "model": "isotests.hardwaretype", + "model": "releng.hardwaretype", "fields": { "name": "virtualbox" } }, { "pk": 2, - "model": "isotests.hardwaretype", + "model": "releng.hardwaretype", "fields": { "name": "qemu" } }, { "pk": 3, - "model": "isotests.hardwaretype", + "model": "releng.hardwaretype", "fields": { "name": "intel i686" } }, { "pk": 4, - "model": "isotests.hardwaretype", + "model": "releng.hardwaretype", "fields": { "name": "intel x86_64" } }, { "pk": 5, - "model": "isotests.hardwaretype", + "model": "releng.hardwaretype", "fields": { "name": "amd i686" } }, { "pk": 6, - "model": "isotests.hardwaretype", + "model": "releng.hardwaretype", "fields": { "name": "amd x86_64" } diff --git a/isotests/fixtures/installtype.json b/releng/fixtures/installtype.json index cc5c62a0..7fa21fc1 100644 --- a/isotests/fixtures/installtype.json +++ b/releng/fixtures/installtype.json @@ -1,28 +1,28 @@ [ { "pk": 1, - "model": "isotests.installtype", + "model": "releng.installtype", "fields": { "name": "interactive install" } }, { "pk": 2, - "model": "isotests.installtype", + "model": "releng.installtype", "fields": { "name": "automatic install generic example" } }, { "pk": 3, - "model": "isotests.installtype", + "model": "releng.installtype", "fields": { "name": "automatic install fancy example" } }, { "pk": 4, - "model": "isotests.installtype", + "model": "releng.installtype", "fields": { "name": "automatic install custom config (specify in comments)" } diff --git a/isotests/fixtures/isotypes.json b/releng/fixtures/isotypes.json index 760e3738..a529b181 100644 --- a/isotests/fixtures/isotypes.json +++ b/releng/fixtures/isotypes.json @@ -1,14 +1,14 @@ [ { "pk": 1, - "model": "isotests.isotype", + "model": "releng.isotype", "fields": { "name": "core" } }, { "pk": 2, - "model": "isotests.isotype", + "model": "releng.isotype", "fields": { "name": "net" } diff --git a/isotests/fixtures/modules.json b/releng/fixtures/modules.json index ae8a1683..9cdf1a8d 100644 --- a/isotests/fixtures/modules.json +++ b/releng/fixtures/modules.json @@ -1,84 +1,84 @@ [ { "pk": 1, - "model": "isotests.module", + "model": "releng.module", "fields": { "name": "lvm2" } }, { "pk": 2, - "model": "isotests.module", + "model": "releng.module", "fields": { "name": "dm_crypt" } }, { "pk": 3, - "model": "isotests.module", + "model": "releng.module", "fields": { "name": "softraid" } }, { "pk": 4, - "model": "isotests.module", + "model": "releng.module", "fields": { "name": "nilfs2" } }, { "pk": 5, - "model": "isotests.module", + "model": "releng.module", "fields": { "name": "btrfs" } }, { "pk": 6, - "model": "isotests.module", + "model": "releng.module", "fields": { "name": "ext2" } }, { "pk": 7, - "model": "isotests.module", + "model": "releng.module", "fields": { "name": "ext3" } }, { "pk": 8, - "model": "isotests.module", + "model": "releng.module", "fields": { "name": "ext4" } }, { "pk": 9, - "model": "isotests.module", + "model": "releng.module", "fields": { "name": "swap" } }, { "pk": 10, - "model": "isotests.module", + "model": "releng.module", "fields": { "name": "xfs" } }, { "pk": 11, - "model": "isotests.module", + "model": "releng.module", "fields": { "name": "jfs" } }, { "pk": 12, - "model": "isotests.module", + "model": "releng.module", "fields": { "name": "reiserFS" } diff --git a/isotests/fixtures/source.json b/releng/fixtures/source.json index 1bf835a1..2622f4c1 100644 --- a/isotests/fixtures/source.json +++ b/releng/fixtures/source.json @@ -1,21 +1,21 @@ [ { "pk": 1, - "model": "isotests.source", + "model": "releng.source", "fields": { "name": "net install manual networking config (Check that it works + rc.conf, resolv.conf, mirrorlist)" } }, { "pk": 2, - "model": "isotests.source", + "model": "releng.source", "fields": { "name": "net install dhcp (Check that it works + rc.conf)" } }, { "pk": 3, - "model": "isotests.source", + "model": "releng.source", "fields": { "name": "core" } diff --git a/isotests/management/__init__.py b/releng/management/__init__.py index e69de29b..e69de29b 100644 --- a/isotests/management/__init__.py +++ b/releng/management/__init__.py diff --git a/isotests/management/commands/__init__.py b/releng/management/commands/__init__.py index e69de29b..e69de29b 100644 --- a/isotests/management/commands/__init__.py +++ b/releng/management/commands/__init__.py diff --git a/isotests/management/commands/syncisos.py b/releng/management/commands/syncisos.py index 9c76ccda..247b01cd 100644 --- a/isotests/management/commands/syncisos.py +++ b/releng/management/commands/syncisos.py @@ -5,7 +5,7 @@ from HTMLParser import HTMLParser, HTMLParseError from django.conf import settings from django.core.management.base import BaseCommand, CommandError -from isotests.models import Iso +from releng.models import Iso class IsoListParser(HTMLParser): def __init__(self): diff --git a/isotests/models.py b/releng/models.py index de8dd13c..dc297d5b 100644 --- a/isotests/models.py +++ b/releng/models.py @@ -114,8 +114,8 @@ def set_created_field(sender, **kwargs): from django.db.models.signals import pre_save pre_save.connect(set_created_field, sender=Iso, - dispatch_uid="isotests.models") + dispatch_uid="releng.models") pre_save.connect(set_created_field, sender=Test, - dispatch_uid="isotests.models") + dispatch_uid="releng.models") # vim: set ts=4 sw=4 et: diff --git a/isotests/urls.py b/releng/urls.py index 12497cde..f76a9593 100644 --- a/isotests/urls.py +++ b/releng/urls.py @@ -1,6 +1,6 @@ from django.conf.urls.defaults import patterns -urlpatterns = patterns('isotests.views', +urlpatterns = patterns('releng.views', (r'^$', 'test_results_overview', {}, 'releng-test-overview'), (r'^submit/$', 'submit_test_result', {}, 'releng-test-submit'), (r'^thanks/$', 'submit_test_thanks', {}, 'releng-test-thanks'), diff --git a/isotests/views.py b/releng/views.py index cfd6f408..5cffb2f5 100644 --- a/isotests/views.py +++ b/releng/views.py @@ -63,7 +63,7 @@ def submit_test_result(request): form = TestForm() context = {'form': form} - return direct_to_template(request, 'isotests/add.html', context) + return direct_to_template(request, 'releng/add.html', context) def calculate_option_overview(model, is_rollback=False): option = { @@ -101,7 +101,7 @@ def test_results_overview(request): 'options': all_options, 'iso_url': settings.ISO_LIST_URL, } - return direct_to_template(request, 'isotests/results.html', context) + return direct_to_template(request, 'releng/results.html', context) def test_results_iso(request, iso_id): iso = get_object_or_404(Iso, pk=iso_id) @@ -110,7 +110,7 @@ def test_results_iso(request, iso_id): 'iso_name': iso.name, 'test_list': test_list } - return direct_to_template(request, 'isotests/result_list.html', context) + return direct_to_template(request, 'releng/result_list.html', context) def test_results_for(request, option, value): if option not in Test._meta.get_all_field_names(): @@ -124,9 +124,9 @@ def test_results_for(request, option, value): 'value_id': value, 'test_list': test_list } - return direct_to_template(request, 'isotests/result_list.html', context) + return direct_to_template(request, 'releng/result_list.html', context) def submit_test_thanks(request): - return direct_to_template(request, "isotests/thanks.html", None) + return direct_to_template(request, "releng/thanks.html", None) # vim: set ts=4 sw=4 et: diff --git a/settings.py b/settings.py index a21205d3..db1c93d3 100644 --- a/settings.py +++ b/settings.py @@ -104,7 +104,7 @@ INSTALLED_APPS = ( 'devel', 'public', 'south', # database migration support - 'isotests', + 'releng', ) ## Import local settings diff --git a/templates/isotests/add.html b/templates/releng/add.html index 3678532d..3678532d 100644 --- a/templates/isotests/add.html +++ b/templates/releng/add.html diff --git a/templates/isotests/result_list.html b/templates/releng/result_list.html index b3ae025b..b3ae025b 100644 --- a/templates/isotests/result_list.html +++ b/templates/releng/result_list.html diff --git a/templates/isotests/result_section.html b/templates/releng/result_section.html index 52f03339..52f03339 100644 --- a/templates/isotests/result_section.html +++ b/templates/releng/result_section.html diff --git a/templates/isotests/results.html b/templates/releng/results.html index 033fdbfe..4aca1f10 100644 --- a/templates/isotests/results.html +++ b/templates/releng/results.html @@ -18,7 +18,7 @@ <table> {% for option in options %} - {% include "isotests/result_section.html" %} + {% include "releng/result_section.html" %} {% endfor %} </table> </div> diff --git a/templates/isotests/thanks.html b/templates/releng/thanks.html index b261426d..b261426d 100644 --- a/templates/isotests/thanks.html +++ b/templates/releng/thanks.html @@ -73,11 +73,11 @@ urlpatterns += patterns('', (r'^mirrors/', include('mirrors.urls')), (r'^news/', include('news.urls')), (r'^packages/', include('packages.urls')), + (r'^releng/', include('releng.urls')), (r'^todo/', include('todolists.urls')), (r'^opensearch/packages/$', 'packages.views.opensearch', {}, 'opensearch-packages'), (r'^todolists/$','todolists.views.public_list'), - (r'^isotests/', include('isotests.urls')), ) if settings.DEBUG == True: |