Merge branch 'develop' of github.com:rbanffy/testable_appengine into …

…develop

Conflicts:
	resources/requirements.txt

Makefile

@@ -11,7 +11,7 @@ directories:
 	mkdir -p $(CURDIR)/build $(CURDIR)/cache
 
 appenginesdk: directories
-	wget -c http://commondatastorage.googleapis.com/appengine-sdks/featured/google_appengine_$(version).zip -O $(CURDIR)/cache/google_appengine_$(version).zip
+	wget -c https://storage.googleapis.com/appengine-sdks/featured/google_appengine_$(version).zip -O $(CURDIR)/cache/google_appengine_$(version).zip
 	unzip -q -o $(CURDIR)/cache/google_appengine_$(version).zip -d $(CURDIR)/build
 
 requirements:
@@ -25,8 +25,6 @@ libraries: requirements appenginesdk
 	cp $(CURDIR)/resources/autogenerated $(CURDIR)/$(VENV)/lib/python2.7/site-packages/gae.pth
 	echo "$(CURDIR)/$(VENV)/lib/google_appengine/" >> $(CURDIR)/$(VENV)/lib/python2.7/site-packages/gae.pth
 	echo "import dev_appserver; dev_appserver.fix_sys_path()" >> $(CURDIR)/$(VENV)/lib/python2.7/site-packages/gae.pth
-	cp $(CURDIR)/resources/autogenerated $(CURDIR)/$(VENV)/lib/python2.7/site-packages/utils.pth
-	echo "$(CURDIR)/resources/lib/" >> $(CURDIR)/$(VENV)/lib/python2.7/site-packages/utils.pth
 
 virtualenv:
 	virtualenv $(CURDIR)/$(VENV)
@@ -51,3 +49,6 @@ clean_cache:
 # Deletes the virtualenv
 clean_venv: clean_dirs
 	rm -rf $(CURDIR)/$(VENV)
+
+test: venv
+	.env/bin/nosetests