Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions managed_vms/memcache/main_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

from unittest.case import SkipTest

from testing import CloudTest

from . import main
Expand All @@ -21,6 +23,10 @@ class MemcacheTest(CloudTest):

def test_index(self):
main.memcache_client.set('counter', 0)

if main.memcache_client.get('counter') is None:
raise SkipTest('Memcache is unavailable.')

main.app.testing = True
client = main.app.test_client()

Expand Down
16 changes: 2 additions & 14 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,7 @@ skipsdist = True
envlist = pep8, reqcheck, gae, py27, py34

[testenv]
passenv =
PYTHONPATH
GOOGLE_*
GCLOUD_*
TEST_*
CLOUD_*
TRAVIS*
SQLALCHEMY_DATABASE_URI
PUBSUB_*
GA_TRACKING_ID
MAILGUN_*
SENDGRID_*
TWILIO_*
passenv = *
basepython = python2.7
deps =
-rrequirements.txt
Expand Down Expand Up @@ -56,7 +44,7 @@ deps =
-rrequirements-py27-dev.txt
commands =
# Create a lib directory, otherwise, the vendor library will explode.
mkdir lib
mkdir -p lib
nosetests --with-gae \
--gae-app=appengine/resources/app.yaml \
--logging-level=INFO \
Expand Down