Commits

Hynek Cernoch committed 1c4382c

Fixed multiple tests directories on Python path. issue Satchmo #1277

Comments (0)

Files changed (12)

livesettings/tests/__init__.py

Empty file added.

livesettings/tests/localsite/__init__.py

Empty file added.

livesettings/tests/localsite/models.py

Empty file added.

livesettings/tests/manage.py

+#!/usr/bin/env python
+import os.path
+import sys
+
+DIRNAME = os.path.dirname(__file__)
+# trick to get the two-levels up directory, which for the "simple" project should be the satchmo dir
+_parent = lambda x: os.path.normpath(os.path.join(x, '..'))
+
+SATCHMO_DIRNAME = _parent(_parent(DIRNAME))
+SATCHMO_APPS = os.path.join(SATCHMO_DIRNAME, 'apps')
+
+if not SATCHMO_APPS in sys.path:
+    sys.path.append(SATCHMO_APPS)
+
+if not DIRNAME in sys.path:
+    sys.path.append(DIRNAME)
+
+from django.core.management import execute_manager
+try:
+    import settings # Assumed to be in the same directory.
+except ImportError:
+    import sys
+    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
+    sys.exit(1)
+
+if __name__ == "__main__":
+    execute_manager(settings)

livesettings/tests/settings.py

+# Django settings for satchmo project.
+# If you have an existing project, then ensure that you modify local_settings-customize.py
+# and import it from your main settings file. (from local_settings import *)
+import os
+
+DIRNAME = os.path.dirname(__file__)
+
+DJANGO_PROJECT = 'tests'
+DJANGO_SETTINGS_MODULE = 'tests.settings'
+
+ADMINS = (
+     ('', ''),
+)
+
+MANAGERS = ADMINS
+
+DATABASE_ENGINE = 'sqlite3'           # 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
+DATABASE_NAME = 'test.db'             # Or path to database file if using sqlite3.
+
+# Local time zone for this installation. All choices can be found here:
+# http://www.postgresql.org/docs/current/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
+TIME_ZONE = 'US/Pacific'
+
+# Language code for this installation. All choices can be found here:
+# http://www.w3.org/TR/REC-html40/struct/dirlang.html#langcodes
+# http://blogs.law.harvard.edu/tech/stories/storyReader$15
+LANGUAGE_CODE = 'en-us'
+
+SITE_ID = 1
+
+# Absolute path to the directory that holds media.
+# Example: "/home/media/media.lawrence.com/"
+#Image files will be stored off of this path
+MEDIA_ROOT = os.path.join(DIRNAME, 'static/')
+#MEDIA_ROOT = "/static"
+# URL that handles the media served from MEDIA_ROOT.
+# Example: "http://media.lawrence.com"
+#MEDIA_URL = 'site_media'
+MEDIA_URL="/static/"
+# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
+# trailing slash.
+# Examples: "http://foo.com/media/", "/media/".
+ADMIN_MEDIA_PREFIX = '/media/'
+
+# Make this unique, and don't share it with anybody.
+SECRET_KEY = ''
+
+# List of callables that know how to import templates from various sources.
+TEMPLATE_LOADERS = (
+    'django.template.loaders.filesystem.load_template_source',
+    'django.template.loaders.app_directories.load_template_source',
+#     'django.template.loaders.eggs.load_template_source',
+)
+
+MIDDLEWARE_CLASSES = (
+    "django.middleware.common.CommonMiddleware",
+    "django.contrib.sessions.middleware.SessionMiddleware",
+    "django.middleware.locale.LocaleMiddleware",
+    "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "django.middleware.doc.XViewMiddleware",
+    #'debug_toolbar.middleware.DebugToolbarMiddleware',
+)
+
+#this is used to add additional config variables to each request
+# NOTE: overridden in local_settings.py
+# NOTE: If you enable the recent_products context_processor, you MUST have the
+# 'satchmo_ext.recentlist' app installed.
+TEMPLATE_CONTEXT_PROCESSORS = ('django.core.context_processors.auth',)
+
+ROOT_URLCONF = 'tests.urls'
+
+INSTALLED_APPS = (
+    'django.contrib.sites',
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.comments',
+    'django.contrib.sessions',
+    'django.contrib.sitemaps',
+    'livesettings',
+    'keyedcache',
+    'tests.localsite',
+)
+
+AUTHENTICATION_BACKENDS = (
+    'django.contrib.auth.backends.ModelBackend',
+)
+
+DEBUG_TOOLBAR_CONFIG = {
+   'INTERCEPT_REDIRECTS' : False,
+}
+
+CACHE_PREFIX = 'T'
+CACHE_TIMEOUT = 300

livesettings/tests/urls.py

+from django.conf.urls.defaults import patterns, include
+from django.contrib import admin
+
+admin.autodiscover()
+
+urlpatterns = patterns('',
+    (r'^admin/settings/$', include('livesettings.urls')),
+)

tests/__init__.py

Empty file removed.

tests/localsite/__init__.py

Empty file removed.

tests/localsite/models.py

Empty file removed.

tests/manage.py

-#!/usr/bin/env python
-import os.path
-import sys
-
-DIRNAME = os.path.dirname(__file__)
-# trick to get the two-levels up directory, which for the "simple" project should be the satchmo dir
-_parent = lambda x: os.path.normpath(os.path.join(x, '..'))
-
-SATCHMO_DIRNAME = _parent(_parent(DIRNAME))
-SATCHMO_APPS = os.path.join(SATCHMO_DIRNAME, 'apps')
-
-if not SATCHMO_APPS in sys.path:
-    sys.path.append(SATCHMO_APPS)
-
-if not DIRNAME in sys.path:
-    sys.path.append(DIRNAME)
-
-from django.core.management import execute_manager
-try:
-    import settings # Assumed to be in the same directory.
-except ImportError:
-    import sys
-    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
-    sys.exit(1)
-
-if __name__ == "__main__":
-    execute_manager(settings)

tests/settings.py

-# Django settings for satchmo project.
-# If you have an existing project, then ensure that you modify local_settings-customize.py
-# and import it from your main settings file. (from local_settings import *)
-import os
-
-DIRNAME = os.path.dirname(__file__)
-
-DJANGO_PROJECT = 'tests'
-DJANGO_SETTINGS_MODULE = 'tests.settings'
-
-ADMINS = (
-     ('', ''),
-)
-
-MANAGERS = ADMINS
-
-DATABASE_ENGINE = 'sqlite3'           # 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
-DATABASE_NAME = 'test.db'             # Or path to database file if using sqlite3.
-
-# Local time zone for this installation. All choices can be found here:
-# http://www.postgresql.org/docs/current/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
-TIME_ZONE = 'US/Pacific'
-
-# Language code for this installation. All choices can be found here:
-# http://www.w3.org/TR/REC-html40/struct/dirlang.html#langcodes
-# http://blogs.law.harvard.edu/tech/stories/storyReader$15
-LANGUAGE_CODE = 'en-us'
-
-SITE_ID = 1
-
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-#Image files will be stored off of this path
-MEDIA_ROOT = os.path.join(DIRNAME, 'static/')
-#MEDIA_ROOT = "/static"
-# URL that handles the media served from MEDIA_ROOT.
-# Example: "http://media.lawrence.com"
-#MEDIA_URL = 'site_media'
-MEDIA_URL="/static/"
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/media/'
-
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = ''
-
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.load_template_source',
-    'django.template.loaders.app_directories.load_template_source',
-#     'django.template.loaders.eggs.load_template_source',
-)
-
-MIDDLEWARE_CLASSES = (
-    "django.middleware.common.CommonMiddleware",
-    "django.contrib.sessions.middleware.SessionMiddleware",
-    "django.middleware.locale.LocaleMiddleware",
-    "django.contrib.auth.middleware.AuthenticationMiddleware",
-    "django.middleware.doc.XViewMiddleware",
-    #'debug_toolbar.middleware.DebugToolbarMiddleware',
-)
-
-#this is used to add additional config variables to each request
-# NOTE: overridden in local_settings.py
-# NOTE: If you enable the recent_products context_processor, you MUST have the
-# 'satchmo_ext.recentlist' app installed.
-TEMPLATE_CONTEXT_PROCESSORS = ('django.core.context_processors.auth',)
-
-ROOT_URLCONF = 'tests.urls'
-
-INSTALLED_APPS = (
-    'django.contrib.sites',
-    'django.contrib.admin',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.comments',
-    'django.contrib.sessions',
-    'django.contrib.sitemaps',
-    'livesettings',
-    'keyedcache',
-    'tests.localsite',
-)
-
-AUTHENTICATION_BACKENDS = (
-    'django.contrib.auth.backends.ModelBackend',
-)
-
-DEBUG_TOOLBAR_CONFIG = {
-   'INTERCEPT_REDIRECTS' : False,
-}
-
-CACHE_PREFIX = 'T'
-CACHE_TIMEOUT = 300

tests/urls.py

-from django.conf.urls.defaults import patterns, include
-from django.contrib import admin
-
-admin.autodiscover()
-
-urlpatterns = patterns('',
-    (r'^admin/settings/$', include('livesettings.urls')),
-)