openstack
/
congress
Code Issues Proposed changes

Fixed Makefile, scripts for change in dir name src 

Brokedown test case into multiple test cases : TestPolicyApi(AbstractApiTest)

Change-Id: I408fd9749fa54f5a0e882932d6253d7bcc2829ca
This commit is contained in:
Rajdeep Dua 2014-01-28 10:11:40 +05:30
parent 0340392fae
commit e36bbc9a43
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -1,14 +1,14 @@
TOPDIR=$(CURDIR)
SRCDIR=$(TOPDIR)/src
SRCDIR=$(TOPDIR)/congress
all: CongressLexer.py
clean:
rm -f Congress.tokens src/policy/CongressLexer.py src/policy/CongressParser.py
rm -f Congress.tokens congress/policy/CongressLexer.py congress/policy/CongressParser.py
find . -name '*.pyc' -exec rm -f {} \;
CongressLexer.py CongressParser.py: src/policy/Congress.g
CongressLexer.py CongressParser.py: congress/policy/Congress.g
java -jar $(TOPDIR)/thirdparty/antlr-3.5-complete.jar $(SRCDIR)/policy/Congress.g

3
congress/tests/functional/test_api.py
View File

@ -28,7 +28,7 @@ import uuid
FUNCTIONAL_TESTS_PATH = os.path.dirname(os.path.realpath(__file__))
TESTS_PATH = os.path.dirname(FUNCTIONAL_TESTS_PATH)
PROJECT_PATH = os.path.dirname(TESTS_PATH)
SRC_PATH = os.path.join(PROJECT_PATH, 'src')
SRC_PATH = PROJECT_PATH
class AbstractApiTest(unittest.TestCase):
@ -103,6 +103,7 @@ class AbstractApiTest(unittest.TestCase):
class TestTablesApi(AbstractApiTest):
print SRC_PATH
API_SERVER_PATH = os.path.join(SRC_PATH, 'server', 'server.py')
STATIC_TABLES = ['ad-groups']

2
scripts/run_api_server
View File

@ -38,7 +38,7 @@ fi
SRCSCRIPT=`readlink -f $0`
SCRIPTDIR=`dirname $SRCSCRIPT`
ROOTDIR=`dirname $SCRIPTDIR`
PYSRCDIR=$ROOTDIR/src
PYSRCDIR=$ROOTDIR/congress
SERVERDIR=$PYSRCDIR/server
POLICYDIR=$PYSRCDIR/policy
THIRDPARTYDIR=$ROOTDIR/thirdparty

11
scripts/run_tests
View File

@ -21,17 +21,16 @@ SRCSCRIPT=`readlink -f $0`
SCRIPTDIR=`dirname $SRCSCRIPT`
ROOTDIR=`dirname $SCRIPTDIR`
PYSRCDIR=$ROOTDIR/src
SRCDIR=$ROOTDIR/congress
THIRDPARTYDIR=$ROOTDIR/thirdparty
TESTDIR=$ROOTDIR/tests
export PYTHONPATH=$SRCDIR:$THIRDPARTYDIR
TESTDIR=$ROOTDIR/congress/tests
export PYTHONPATH=$SRCDIR:$THIRDPARTYDIR:$SRCDIR/policy
# Use nosetests to find all unitests in tree
ARGS="$@"
cd $ROOTDIR
nosetests $ARGS
cd $ROOTDIR
export PYTHONPATH=$TESTDIR/functional:$PYTHONPATH
python -m unittest test_api
cd $ROOTDIR/congress/tests
nosetests functional/test_api.py