Skip to content

Commit

Permalink
Merge pull request #60 from tangentlabs/issue/60/get-tests-passed-on-…
Browse files Browse the repository at this point in the history
…travis

Get tests passing on travis
  • Loading branch information
codeinthehole committed Apr 16, 2013
2 parents 51c20f0 + 8e32c62 commit fcf50b9
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions runtests.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from oscar.defaults import OSCAR_SETTINGS
from oscar import OSCAR_MAIN_TEMPLATE_DIR, OSCAR_CORE_APPS

from stores.defaults import STORES_SETTINGS

location = lambda x: os.path.join(
os.path.dirname(os.path.realpath(__file__)), x)
Expand Down Expand Up @@ -82,7 +81,6 @@ def configure():
)

default_settings = OSCAR_SETTINGS
default_settings.update(STORES_SETTINGS)
pairs.update(default_settings)

# Look for a settings_local module that provides overrides for these test
Expand Down

0 comments on commit fcf50b9

Please sign in to comment.