Merge remote-tracking branch 'origin/master'

hasgeek · Jul 14, 2017 · fd66040 · fd66040
2 parents 5d997fa + e19202a
commit fd66040
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,4 +23,6 @@ after_success:
   - coveralls
 notifications:
   email: false
-  slack: friendsofhasgeek:3bLViYSzhfaThJovFYCVD3fX
+  slack:
+    - hasgeek:HDCoMDj3T4ICB59qFFVorCG8
+    - friendsofhasgeek:3bLViYSzhfaThJovFYCVD3fX
diff --git a/runtests.sh b/runtests.sh
@@ -1,3 +1,5 @@
 #!/bin/sh
-coverage run `which nosetests`
-coverage report
+set -e
+export FLASK_ENV="TESTING"
+coverage run `which nosetests` "$@"
+coverage report -m
diff --git a/shell.py b/shell.py
@@ -6,15 +6,15 @@
     pass
 from pprint import pprint  # NOQA
 from coaster.sqlalchemy import BaseMixin
-from coaster import newid
+from coaster.utils import buid
 
 from flask import Flask
 from nodular import *  # NOQA
 
 
 class User(BaseMixin, db.Model):
     __tablename__ = 'user'
-    userid = db.Column(db.Unicode(22), nullable=False, default=newid, unique=True)
+    userid = db.Column(db.Unicode(22), nullable=False, default=buid, unique=True)
     username = db.Column(db.Unicode(250), nullable=True)