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

rustyrazorblade · rustyrazorblade · commit 260037750b5b · 2014-08-13T10:33:42.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,6 @@ dist
 build
 eggs
 parts
-bin
 var
 sdist
 develop-eggs
diff --git a/.travis.yml b/.travis.yml
@@ -1,16 +1,16 @@
 language: python
 
 env:
-  - C_VERSION=12
-  - C_VERSION=20
+  - CASSANDRA_VERSION=12
+  - CASSANDRA_VERSION=20
 
 python:
   - "2.7"
   - "3.4"
 
 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-src 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 ${CASSANDRA_VERSION}x main" | sudo tee -a /etc/apt/sources.list
   - sudo gpg --keyserver pgp.mit.edu --recv-keys F758CE318D77295D
   - sudo gpg --export --armor F758CE318D77295D | sudo apt-key add -
   - sudo gpg --keyserver pgp.mit.edu --recv-keys 2B5C1B00
@@ -25,4 +25,4 @@ install:
   - "pip install -r requirements.txt --use-mirrors"
 
 script:
-  - "nosetests --no-skip"
+  - "bin/test.py --no-skip"
diff --git a/cqlengine/tests/management/test_management.py b/cqlengine/tests/management/test_management.py
@@ -124,7 +124,7 @@ class ModelWithTableProperties(Model):
     __default_time_to_live__ = 4756
     __gc_grace_seconds__ = 2063
     __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
     __read_repair_chance__ = 0.17985
     __replicate_on_write__ = False

-Original file line number
+Diff line change
 build
 eggs
 parts
 -bin
 var
 sdist
 develop-eggs