fixed test management commands
parent
f7c9df935f
commit
f84e732767
|
|
@ -7,7 +7,7 @@ import sys
|
||||||
import time
|
import time
|
||||||
from pprint import pprint
|
from pprint import pprint
|
||||||
from random import Random
|
from random import Random
|
||||||
from django.core.management.base import NoArgsCommand
|
from django.core.management import BaseCommand
|
||||||
from django.db import connection
|
from django.db import connection
|
||||||
|
|
||||||
from pexp.models import *
|
from pexp.models import *
|
||||||
|
|
@ -46,7 +46,7 @@ def print_timing(func, message='', iterations=1):
|
||||||
return wrapper
|
return wrapper
|
||||||
|
|
||||||
|
|
||||||
class Command(NoArgsCommand):
|
class Command(BaseCommand):
|
||||||
help = ""
|
help = ""
|
||||||
|
|
||||||
def handle_noargs(self, **options):
|
def handle_noargs(self, **options):
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ This module is a scratchpad for general development, testing & debugging
|
||||||
import time
|
import time
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
from django.core.management.base import NoArgsCommand
|
from django.core.management import BaseCommand
|
||||||
from django.db import connection
|
from django.db import connection
|
||||||
from pprint import pprint
|
from pprint import pprint
|
||||||
from pexp.models import *
|
from pexp.models import *
|
||||||
|
|
@ -60,7 +60,7 @@ def run_vanilla_any_poly(func, iterations=1):
|
||||||
# benchmarks
|
# benchmarks
|
||||||
|
|
||||||
def bench_create(model):
|
def bench_create(model):
|
||||||
for i in xrange(num_objects):
|
for i in range(num_objects):
|
||||||
model.objects.create(field1='abc' + str(i), field2='abcd' + str(i), field3='abcde' + str(i))
|
model.objects.create(field1='abc' + str(i), field2='abcd' + str(i), field3='abcde' + str(i))
|
||||||
# print 'count:',model.objects.count()
|
# print 'count:',model.objects.count()
|
||||||
|
|
||||||
|
|
@ -71,7 +71,7 @@ def bench_load1(model):
|
||||||
|
|
||||||
|
|
||||||
def bench_load1_short(model):
|
def bench_load1_short(model):
|
||||||
for i in xrange(num_objects / 100):
|
for i in range(num_objects / 100):
|
||||||
for o in model.objects.all()[:100]:
|
for o in model.objects.all()[:100]:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
@ -84,7 +84,7 @@ def bench_load2(model):
|
||||||
|
|
||||||
|
|
||||||
def bench_load2_short(model):
|
def bench_load2_short(model):
|
||||||
for i in xrange(num_objects / 100):
|
for i in range(num_objects / 100):
|
||||||
for o in model.objects.all()[:100]:
|
for o in model.objects.all()[:100]:
|
||||||
f1 = o.field1
|
f1 = o.field1
|
||||||
f2 = o.field2
|
f2 = o.field2
|
||||||
|
|
@ -98,7 +98,7 @@ def bench_delete(model):
|
||||||
# Command
|
# Command
|
||||||
|
|
||||||
|
|
||||||
class Command(NoArgsCommand):
|
class Command(BaseCommand):
|
||||||
help = ""
|
help = ""
|
||||||
|
|
||||||
def handle_noargs(self, **options):
|
def handle_noargs(self, **options):
|
||||||
|
|
@ -112,5 +112,3 @@ class Command(NoArgsCommand):
|
||||||
]
|
]
|
||||||
for f, iterations in func_list:
|
for f, iterations in func_list:
|
||||||
run_vanilla_any_poly(f, iterations=iterations)
|
run_vanilla_any_poly(f, iterations=iterations)
|
||||||
|
|
||||||
print
|
|
||||||
|
|
|
||||||
|
|
@ -3,12 +3,12 @@
|
||||||
This module is a scratchpad for general development, testing & debugging
|
This module is a scratchpad for general development, testing & debugging
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from django.core.management.base import NoArgsCommand
|
from django.core.management import BaseCommand
|
||||||
|
|
||||||
from pexp.models import *
|
from pexp.models import *
|
||||||
|
|
||||||
|
|
||||||
class Command(NoArgsCommand):
|
class Command(BaseCommand):
|
||||||
help = ""
|
help = ""
|
||||||
|
|
||||||
def handle_noargs(self, **options):
|
def handle_noargs(self, **options):
|
||||||
|
|
@ -16,5 +16,4 @@ class Command(NoArgsCommand):
|
||||||
o = Project.objects.create(topic="John's gathering")
|
o = Project.objects.create(topic="John's gathering")
|
||||||
o = ArtProject.objects.create(topic="Sculpting with Tim", artist="T. Turner")
|
o = ArtProject.objects.create(topic="Sculpting with Tim", artist="T. Turner")
|
||||||
o = ResearchProject.objects.create(topic="Swallow Aerodynamics", supervisor="Dr. Winter")
|
o = ResearchProject.objects.create(topic="Swallow Aerodynamics", supervisor="Dr. Winter")
|
||||||
print Project.objects.all()
|
print(Project.objects.all())
|
||||||
print
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue