summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEgor Yurtaev <yurtaev.egor@gmail.com>2014-12-26 14:00:10 +0600
committerEgor Yurtaev <yurtaev.egor@gmail.com>2014-12-26 14:00:10 +0600
commit9fd56f36705ee40bde9cdbf0f2090b49a3f6a57b (patch)
tree4712c66fcc1c57956dc436999df47c0619b8055a
parent08c255b6cc0e9087f01374714aa41727dd71975b (diff)
downloadomaha-server-9fd56f36705ee40bde9cdbf0f2090b49a3f6a57b.zip
omaha-server-9fd56f36705ee40bde9cdbf0f2090b49a3f6a57b.tar.gz
omaha-server-9fd56f36705ee40bde9cdbf0f2090b49a3f6a57b.tar.bz2
removed field Symbols.version
-rw-r--r--omaha_server/crash/admin.py4
-rw-r--r--omaha_server/crash/forms.py3
-rw-r--r--omaha_server/crash/migrations/0011_auto_20141226_0754.py22
-rw-r--r--omaha_server/crash/models.py1
-rw-r--r--omaha_server/crash/tests/test_forms.py8
-rw-r--r--omaha_server/crash/tests/test_models.py7
6 files changed, 25 insertions, 20 deletions
diff --git a/omaha_server/crash/admin.py b/omaha_server/crash/admin.py
index 68c38f9..85a75e5 100644
--- a/omaha_server/crash/admin.py
+++ b/omaha_server/crash/admin.py
@@ -35,6 +35,6 @@ class CrashAdmin(admin.ModelAdmin):
@admin.register(Symbols)
class SymbolsAdmin(admin.ModelAdmin):
- list_display = ('version',)
- list_display_links = ('version',)
+ list_display = ('debug_file', 'debug_id',)
+ list_display_links = ('debug_file', 'debug_id',)
form = SymbolsAdminForm
diff --git a/omaha_server/crash/forms.py b/omaha_server/crash/forms.py
index 9027a2a..b0f7a2d 100644
--- a/omaha_server/crash/forms.py
+++ b/omaha_server/crash/forms.py
@@ -24,7 +24,6 @@ from django import forms
from django.core.files.uploadedfile import SimpleUploadedFile
from django.forms import widgets
-from django_select2 import Select2Widget
from django_ace import AceWidget
from crash.models import Symbols
from models import Crash
@@ -74,8 +73,6 @@ class SymbolsAdminForm(forms.ModelForm):
model = Symbols
exclude = []
widgets = {
- 'version': Select2Widget(attrs={'style': 'width:300px'},
- select2_options={'minimumResultsForSearch': 2}),
'debug_id': widgets.TextInput(attrs=dict(disabled='disabled')),
'debug_file': widgets.TextInput(attrs=dict(disabled='disabled')),
}
diff --git a/omaha_server/crash/migrations/0011_auto_20141226_0754.py b/omaha_server/crash/migrations/0011_auto_20141226_0754.py
new file mode 100644
index 0000000..af36fa3
--- /dev/null
+++ b/omaha_server/crash/migrations/0011_auto_20141226_0754.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('crash', '0010_crash_archive'),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name='crash',
+ options={'verbose_name_plural': 'Crashes'},
+ ),
+ migrations.RemoveField(
+ model_name='symbols',
+ name='version',
+ ),
+ ]
diff --git a/omaha_server/crash/models.py b/omaha_server/crash/models.py
index a44a31d..f1fa015 100644
--- a/omaha_server/crash/models.py
+++ b/omaha_server/crash/models.py
@@ -52,7 +52,6 @@ def symbols_upload_to(obj, filename):
class Symbols(TimeStampedModel):
- version = models.ForeignKey(Version)
debug_id = models.CharField(verbose_name='Debug ID', max_length=33, db_index=True, null=True, blank=True)
debug_file = models.CharField(verbose_name='Debug file name', max_length=140, null=True, blank=True)
file = models.FileField(upload_to=symbols_upload_to)
diff --git a/omaha_server/crash/tests/test_forms.py b/omaha_server/crash/tests/test_forms.py
index fd539c4..26de091 100644
--- a/omaha_server/crash/tests/test_forms.py
+++ b/omaha_server/crash/tests/test_forms.py
@@ -23,8 +23,6 @@ import os
from django.test import TestCase
from django.core.files.uploadedfile import SimpleUploadedFile
-from omaha.tests.utils import temporary_media_root
-from omaha.factories import VersionFactory
from crash.forms import SymbolsAdminForm, CrashFrom
@@ -35,10 +33,6 @@ TAR_FILE = os.path.join(TEST_DATA_DIR, 'foo.tar')
class SymbolsAdminFormTest(TestCase):
- @temporary_media_root()
- def setUp(self):
- self.version = VersionFactory.create(file=SimpleUploadedFile('./chrome_installer.exe', b''))
-
def test_parse_debug_meta_info(self):
head = 'MODULE windows x86 C1C0FA629EAA4B4D9DD2ADE270A231CC1 BreakpadTestApp.pdb'
form = SymbolsAdminForm()
@@ -47,7 +41,7 @@ class SymbolsAdminFormTest(TestCase):
debug_file='BreakpadTestApp.pdb'))
def test_form(self):
- form_data = {'version': self.version.pk}
+ form_data = {}
with open(SYM_FILE, 'rb') as f:
form_file_data = {'file': SimpleUploadedFile('BreakpadTestApp.sym', f.read())}
diff --git a/omaha_server/crash/tests/test_models.py b/omaha_server/crash/tests/test_models.py
index 0711be8..6b87eaf 100644
--- a/omaha_server/crash/tests/test_models.py
+++ b/omaha_server/crash/tests/test_models.py
@@ -25,7 +25,6 @@ from django.core.files.uploadedfile import SimpleUploadedFile
from crash.models import Crash, Symbols, symbols_upload_to
from omaha.tests.utils import temporary_media_root
-from omaha.factories import VersionFactory
BASE_DIR = os.path.dirname(__file__)
@@ -60,16 +59,11 @@ class CrashModelTest(test.TestCase):
class SymbolsModelTest(test.TestCase):
@temporary_media_root()
- def setUp(self):
- self.version = VersionFactory.create(file=SimpleUploadedFile('./chrome_installer.exe', b''))
-
- @temporary_media_root()
def test_model(self):
with open(SYM_FILE, 'rb') as f:
obj = Symbols.objects.create(
debug_file='BreakpadTestApp.pdb',
debug_id='C1C0FA629EAA4B4D9DD2ADE270A231CC1',
- version=self.version,
file=SimpleUploadedFile(f.name, f.read()),
)
self.assertTrue(obj)
@@ -80,7 +74,6 @@ class SymbolsModelTest(test.TestCase):
obj = Symbols.objects.create(
debug_file='BreakpadTestApp.pdb',
debug_id='C1C0FA629EAA4B4D9DD2ADE270A231CC1',
- version=self.version,
file=SimpleUploadedFile(f.name, f.read()),
)
self.assertIn('symbols/BreakpadTestApp.pdb/C1C0FA629EAA4B4D9DD2ADE270A231CC1/BreakpadTestApp.sym',