Permalink
Browse files

set up data in each testjs run, to ensure clean test state

and also fix initial setup, as create_es.py was so far called before any of
the dependencies were installed, and thus failed
  • Loading branch information...
1 parent 0476378 commit 2b29651b2348d7bb042f26347c8b52d754a49165 @hannosch hannosch committed Feb 19, 2013
Showing with 4 additions and 4 deletions.
  1. +4 −4 Makefile
View
8 Makefile
@@ -27,20 +27,20 @@ test: build
$(BIN)/nosetests -s -d -v --with-coverage --cover-package monolith monolith
testjs: build
+ rm -rf elasticsearch/data/monotest/
elasticsearch/bin/elasticsearch -p es.pid
bin/pserve --pid-file monolith.pid --daemon monolith/tests/monolith.ini
sleep 5
+ $(BIN)/python tools/create_es.py 9998
-testacular start --single-run
kill `cat es.pid`
kill `cat monolith.pid`
- rm monolith.pid
+ rm -f es.pid
+ rm -f monolith.pid
elasticsearch:
curl -C - --progress-bar http://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-$(ES_VERSION).tar.gz | tar -zx
mv elasticsearch-$(ES_VERSION) elasticsearch
chmod a+x elasticsearch/bin/elasticsearch
mv elasticsearch/config/elasticsearch.yml elasticsearch/config/elasticsearch.in.yml
cp elasticsearch.yml elasticsearch/config/elasticsearch.yml
- elasticsearch/bin/elasticsearch -p es.pid; sleep 5
- $(BIN)/python tools/create_es.py 9998
- kill `cat es.pid`

0 comments on commit 2b29651

Please sign in to comment.