Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Commit

Permalink
bug 628845, undoubled beta.
Browse files Browse the repository at this point in the history
  • Loading branch information
davedash committed Jan 26, 2011
1 parent ecba2f5 commit 6a43400
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 4 deletions.
2 changes: 2 additions & 0 deletions apps/input/tests.py
Expand Up @@ -236,10 +236,12 @@ def test_locale_in_get(self):
class RedirectTests(TestCase):
@enforce_ua
def test_redirects(self):
redirect = lambda x: '/en-US/%s/%s' % (settings.DEFAULT_CHANNEL, x)
redirs = {
'/feedback': '/en-US/release/feedback',
'/thanks': '/en-US/%s/thanks' % settings.DEFAULT_CHANNEL,
'/themes': '/en-US/%s/themes' % settings.DEFAULT_CHANNEL,
'/sites': redirect('sites')
}
for link, redir in redirs.iteritems():
self.assertRedirects(self.fxclient.get(link, follow=True), redir,
Expand Down
7 changes: 3 additions & 4 deletions apps/website_issues/urls.py
Expand Up @@ -2,10 +2,9 @@


urlpatterns = patterns('website_issues.views',
# TODO: Split this into beta and release.
url(r'^beta/sites/?$', 'website_issues', name='website_issues'),
url(r'^beta/site/(?P<protocol>\w+)/(?P<url_>.+)$', 'single_site',
url(r'^sites/?$', 'website_issues', name='website_issues'),
url(r'^site/(?P<protocol>\w+)/(?P<url_>.+)$', 'single_site',
name='single_site'),
url(r'^beta/sites/theme/(?P<theme_id>\d+)$', 'site_theme',
url(r'^sites/theme/(?P<theme_id>\d+)$', 'site_theme',
name='site_theme'),
)
11 changes: 11 additions & 0 deletions scripts/build.sh
Expand Up @@ -38,6 +38,17 @@ DATABASES = {
'TEST_NAME': 'test_input_$1',
'TEST_CHARSET': 'utf8',
'TEST_COLLATION': 'utf8_general_ci',
},
'website_issues': {
'ENGINE': 'mysql',
'HOST': 'sm-hudson01',
'NAME': 'input_$1',
'USER': 'hudson',
'PASSWORD': '',
'OPTIONS': {'init_command': 'SET storage_engine=InnoDB'},
'TEST_NAME': 'test_input_$1',
'TEST_CHARSET': 'utf8',
'TEST_COLLATION': 'utf8_general_ci',
}
}
Expand Down

0 comments on commit 6a43400

Please sign in to comment.