Mercurial > kallithea

changeset 462:298546182b41

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more test suites on login, fixed strange detached instance bug found during in tests. on __repr__ function fixed timerproxy query formatting
author Marcin Kuzminski <marcin@python-works.com>
date Sun, 05 Sep 2010 23:40:08 +0200
parents e95621133eb6
children a03250279b15
files MANIFEST.in pylons_app/lib/timerproxy.py pylons_app/model/db.py pylons_app/tests/functional/test_hg.py pylons_app/tests/functional/test_login.py
diffstat 5 files changed, 20 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/MANIFEST.in	Sun Sep 05 18:07:37 2010 +0200
+++ b/MANIFEST.in	Sun Sep 05 23:40:08 2010 +0200
@@ -1,3 +1,5 @@
+include COPYING
+include README.rst
 include pylons_app/config/deployment.ini_tmpl
 
 include hg_app_daemon
--- a/pylons_app/lib/timerproxy.py	Sun Sep 05 18:07:37 2010 +0200
+++ b/pylons_app/lib/timerproxy.py	Sun Sep 05 23:40:08 2010 +0200
@@ -22,6 +22,7 @@
     sql = sql.replace('\n', '')
     sql = one_space_trim(sql)
     sql = sql\
+        .replace(',',',\n\t')\
         .replace('SELECT', '\n\tSELECT \n\t')\
         .replace('UPDATE', '\n\tUPDATE \n\t')\
         .replace('DELETE', '\n\tDELETE \n\t')\
--- a/pylons_app/model/db.py	Sun Sep 05 18:07:37 2010 +0200
+++ b/pylons_app/model/db.py	Sun Sep 05 23:40:08 2010 +0200
@@ -56,7 +56,7 @@
             self.last_login = datetime.datetime.now()
             session.add(self)
             session.commit()
-            log.debug('updated user %s lastlogin',self)
+            log.debug('updated user %s lastlogin',self.username)
         except Exception:
             session.rollback()        
     
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pylons_app/tests/functional/test_hg.py	Sun Sep 05 23:40:08 2010 +0200
@@ -0,0 +1,8 @@
+from pylons_app.tests import *
+
+class TestAdminController(TestController):
+
+    def test_index(self):
+                
+        response = self.app.get(url(controller='hg', action='index'))
+        # Test response...
\ No newline at end of file
--- a/pylons_app/tests/functional/test_login.py	Sun Sep 05 18:07:37 2010 +0200
+++ b/pylons_app/tests/functional/test_login.py	Sun Sep 05 23:40:08 2010 +0200
@@ -12,13 +12,19 @@
                                  {'username':'test_admin',
                                   'password':'test'})
         assert response.status == '302 Found','Wrong response code from login'
+        assert response.session['hg_app_user'].username =='test_admin','wrong logged in user'
+        response = response.follow()
+        assert 'auto description for vcs_test' in response.body
     
     def test_login_regular_ok(self):
         response = self.app.post(url(controller='login', action='index'),
-                                 {'username':'test_admin',
+                                 {'username':'test_regular',
                                   'password':'test'})
         assert response.status == '302 Found','Wrong response code from login'
-    
+        assert response.session['hg_app_user'].username =='test_regular','wrong logged in user'
+        response = response.follow()
+        assert 'auto description for vcs_test' in response.body
+        assert '<a title="Admin" href="/_admin">' not in response.body
     
     def test_login_ok_came_from(self):
         test_came_from = '/_admin/users'