openstack/deb-python-cassandra-driver
Code Issues Proposed changes

upgrading testing to use bin/test.py, which will let me do some beautiful magic

Browse Source
This commit is contained in:
Jon Haddad
2014-08-13 10:33:42 -07:00
parent 8df170e549
commit 260037750b
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -7,7 +7,6 @@ dist
build build
eggs eggs
parts parts
bin
var var
sdist sdist
develop-eggs develop-eggs

10
.travis.yml
View File

@@ -1,16 +1,16 @@
language: python language: python
env: env:
- C_VERSION=12 - CASSANDRA_VERSION=12
- C_VERSION=20 - CASSANDRA_VERSION=20
python: python:
- "2.7" - "2.7"
- "3.4" - "3.4"
before_install: before_install:
- sudo echo "deb http://www.apache.org/dist/cassandra/debian ${C_VERSION}x main" | sudo tee -a /etc/apt/sources.list - sudo echo "deb http://www.apache.org/dist/cassandra/debian ${CASSANDRA_VERSION}x main" | sudo tee -a /etc/apt/sources.list
- sudo echo "deb-src http://www.apache.org/dist/cassandra/debian ${C_VERSION}x main" | sudo tee -a /etc/apt/sources.list - sudo echo "deb-src http://www.apache.org/dist/cassandra/debian ${CASSANDRA_VERSION}x main" | sudo tee -a /etc/apt/sources.list
- sudo gpg --keyserver pgp.mit.edu --recv-keys F758CE318D77295D - sudo gpg --keyserver pgp.mit.edu --recv-keys F758CE318D77295D
- sudo gpg --export --armor F758CE318D77295D | sudo apt-key add - - sudo gpg --export --armor F758CE318D77295D | sudo apt-key add -
- sudo gpg --keyserver pgp.mit.edu --recv-keys 2B5C1B00 - sudo gpg --keyserver pgp.mit.edu --recv-keys 2B5C1B00
@@ -25,4 +25,4 @@ install:
- "pip install -r requirements.txt --use-mirrors" - "pip install -r requirements.txt --use-mirrors"
script: script:
- "nosetests --no-skip" - "bin/test.py --no-skip"

2
cqlengine/tests/management/test_management.py
View File

@@ -124,7 +124,7 @@ class ModelWithTableProperties(Model):
__default_time_to_live__ = 4756 __default_time_to_live__ = 4756
__gc_grace_seconds__ = 2063 __gc_grace_seconds__ = 2063
__index_interval__ = 98706 __index_interval__ = 98706
__memtable_flush_period_in_ms__ = 43681 #__memtable_flush_period_in_ms__ = 43681 # not compatible w/ cassandra 1.2
__populate_io_cache_on_flush__ = True __populate_io_cache_on_flush__ = True
__read_repair_chance__ = 0.17985 __read_repair_chance__ = 0.17985
__replicate_on_write__ = False __replicate_on_write__ = False