Explorar el Código

Replace previous mentions of "testproj" -> "tests"

Ask Solem hace 15 años
padre
commit
65a3c36d24
Se han modificado 7 ficheros con 9 adiciones y 8 borrados
  1. 1 1
      Changelog
  2. 2 2
      MANIFEST.in
  3. 1 1
      docs/conf.py
  4. 1 1
      pavement.py
  5. 2 2
      setup.py
  6. 1 0
      tests/settings.py
  7. 1 1
      tests/urls.py

+ 1 - 1
Changelog

@@ -1093,7 +1093,7 @@ arguments, so be sure to flush your task queue before you upgrade.
   been executed or not). Set ``settings.CELERY_TASK_META``
 
 * Can now run ``python setup.py test`` to run the unittests from
-  within the ``testproj`` project.
+  within the ``tests`` project.
 
 * Can set the AMQP exchange/routing key/queue using
   ``settings.CELERY_AMQP_EXCHANGE``, ``settings.CELERY_AMQP_ROUTING_KEY``,

+ 2 - 2
MANIFEST.in

@@ -8,9 +8,9 @@ include TODO
 include THANKS
 recursive-include celery *.py
 recursive-include docs *
-recursive-include testproj *
+recursive-include tests *
 recursive-include contrib *
-prune testproj/*.pyc
+prune tests/*.pyc
 prune docs/*.pyc
 prune contrib/*.pyc
 prune celery/*.pyc

+ 1 - 1
docs/conf.py

@@ -7,7 +7,7 @@ import os
 # is relative to the documentation root, use os.path.abspath to make it
 # absolute, like shown here.
 sys.path.append("../celery")
-sys.path.append("../testproj")
+sys.path.append("../tests")
 import settings
 from django.core.management import setup_environ
 from django.conf import settings as dsettings

+ 1 - 1
pavement.py

@@ -97,7 +97,7 @@ def test(options):
         cmd = "env QUICKTEST=1 SKIP_RLIMITS=1 %s" % cmd
     if getattr(options, "verbose", False):
         cmd += " --verbosity=2"
-    sh(cmd, cwd="testproj")
+    sh(cmd, cwd="tests")
 
 
 @task

+ 2 - 2
setup.py

@@ -16,7 +16,7 @@ import celery as distmeta
 
 
 class RunTests(Command):
-    description = "Run the django test suite from the testproj dir."
+    description = "Run the django test suite from the tests dir."
 
     user_options = []
 
@@ -31,7 +31,7 @@ class RunTests(Command):
 
     def run_tests(self):
         this_dir = os.getcwd()
-        testproj_dir = os.path.join(this_dir, "testproj")
+        testproj_dir = os.path.join(this_dir, "tests")
         os.chdir(testproj_dir)
         sys.path.append(testproj_dir)
         from django.core.management import execute_manager

+ 1 - 0
tests/settings.py

@@ -3,6 +3,7 @@
 import os
 import sys
 # import source code dir
+sys.path.insert(0, os.getcwd())
 sys.path.insert(0, os.path.join(os.getcwd(), os.pardir))
 
 SITE_ID = 300

+ 1 - 1
tests/urls.py

@@ -8,7 +8,7 @@ from celery.views import apply
 
 urlpatterns = patterns('',
     # Example:
-    # (r'^testproj/', include('testproj.foo.urls')),
+    # (r'^tests/', include('tests.foo.urls')),
 
     # Uncomment the admin/doc line below and add 'django.contrib.admindocs'
     # to INSTALLED_APPS to enable admin documentation: