Merge pull request #30 from datastax/feature_regression_tests

Feature regression tests

Author: avalanche123

.gitignore

@@ -6,3 +6,4 @@
 /venv/
 /tmp/*
 /docs/
+/cassandra.log

.travis.yml

@@ -31,8 +31,14 @@ install:
 before_script:
   # Use the most-up-to-date run-tests. old ones like 5.3 don't report failure exit codes
   - wget -O ext/run-tests.php https://raw.githubusercontent.com/php/php-src/master/run-tests.php
+  # Use the BEHAT_EXTRA_OPTIONS to supply options to Behat runs
+  - BEHAT_EXTRA_OPTIONS=
+  # Use the BEHAT_SKIP_TAGS to skip tests on TravisCI
+  - BEHAT_SKIP_TAGS=~@skip-travisci
+  - if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.3" ]]; then BEHAT_SKIP_TAGS="${BEHAT_SKIP_TAGS}&&[email protected]"; fi
+  - export BEHAT_EXTRA_OPTIONS BEHAT_SKIP_TAGS
 
 script:
   - cd ext && make test && cd "$TRAVIS_BUILD_DIR" # .phpt tests
   - ./bin/phpunit
-  - ./bin/behat
+  - ./bin/behat --tags="${BEHAT_SKIP_TAGS}" ${BEHAT_EXTRA_OPTIONS}

Vagrantfile

@@ -42,7 +42,7 @@ Vagrant.configure("2") do |config|
   echo "Compiling and installing the extension..."
   pushd /usr/local/src/php-driver/ext
   phpize
-  LDFLAGS="-L$builddir/lib" LIBS="-lssl -lz -luv -lgmp -lstdc++" ./configure --with-cassandra=/tmp/php-driver-installation/build --with-gmp=/tmp/php-driver-installation/build --with-libdir=lib
+  LDFLAGS="-L$builddir/lib" LIBS="-lssl -lz -luv -lm -lgmp -lstdc++" ./configure --with-cassandra=/tmp/php-driver-installation/build --with-gmp=/tmp/php-driver-installation/build --with-libdir=lib
   make
   sudo make install
   sudo sh -c 'echo "extension=cassandra.so" > /etc/php5/cli/conf.d/100-cassandra.ini'

behat.yml

@@ -0,0 +1,32 @@
+default:
+    formatters:
+        pretty: true
+    suites:
+        default:
+            contexts:
+                - FeatureContext:
+                    cluster_name: php-driver-2.1-cluster
+                    cassandra_version: 2.1.5
+
+cassandra-version-2.0:
+    formatters:
+        pretty: true
+    suites:
+        default:
+            filters: "[email protected]"
+            contexts:
+                - FeatureContext:
+                    cluster_name: php-driver-2.0-cluster
+                    cassandra_version: 2.0.13
+
+cassandra-version-1.2:
+    formatters:
+        pretty: true
+    suites:
+        default:
+            filters:
+              tags: "[email protected]&&[email protected]"
+            contexts:
+                - FeatureContext:
+                    cluster_name: php-driver-1.2-cluster
+                    cassandra_version: 1.2.19

ext/php_cassandra.c

@@ -9,7 +9,8 @@
 #include <fcntl.h>
 #include <uv.h>
 
-#define PHP_CASSANDRA_DEFAULT_LOG "php-driver.log"
+#define PHP_CASSANDRA_DEFAULT_LOG       "cassandra.log"
+#define PHP_CASSANDRA_DEFAULT_LOG_LEVEL "ERROR"
 
 static uv_once_t log_once = UV_ONCE_INIT;
 static char* log_location = NULL;
@@ -98,7 +99,7 @@ php_cassandra_log(const CassLogMessage* message, void* data)
     int fd = -1;
 #ifndef _WIN32
     if (!strcmp(log, "syslog")) {
-      php_syslog(LOG_NOTICE, "php-driver | [%s] %s (%s:%d)",
+      php_syslog(LOG_NOTICE, "cassandra | [%s] %s (%s:%d)",
                  cass_log_level_string(message->severity), message->message,
                  message->file, message->line);
       return;
@@ -143,7 +144,7 @@ php_cassandra_log(const CassLogMessage* message, void* data)
    * logging function are thread-safe.
    */
 
-  fprintf(stderr, "php-driver | [%s] %s (%s:%d)%s",
+  fprintf(stderr, "cassandra | [%s] %s (%s:%d)%s",
           cass_log_level_string(message->severity), message->message,
           message->file, message->line,
           PHP_EOL);
@@ -192,9 +193,24 @@ static PHP_INI_MH(OnUpdateLogLevel)
   /* If TSRM is enabled then the last thread to update this wins */
 
   if (new_value) {
-    long log_level = zend_atol(new_value, new_value_length);
-    if (log_level > CASS_LOG_DISABLED && log_level < CASS_LOG_LAST_ENTRY)
-      cass_log_set_level((CassLogLevel) log_level);
+    if (strcmp(new_value, "CRITICAL") == 0) {
+      cass_log_set_level(CASS_LOG_DISABLED);
+    } else if (strcmp(new_value, "ERROR") == 0) {
+      cass_log_set_level(CASS_LOG_ERROR);
+    } else if (strcmp(new_value, "WARN") == 0) {
+      cass_log_set_level(CASS_LOG_WARN);
+    } else if (strcmp(new_value, "INFO") == 0) {
+      cass_log_set_level(CASS_LOG_INFO);
+    } else if (strcmp(new_value, "DEBUG") == 0) {
+      cass_log_set_level(CASS_LOG_DEBUG);
+    } else if (strcmp(new_value, "TRACE") == 0) {
+      cass_log_set_level(CASS_LOG_TRACE);
+    } else {
+      php_error_docref(NULL TSRMLS_CC, E_NOTICE,
+                       "cassandra | Unknown log level '%s', using 'ERROR'",
+                       new_value);
+      cass_log_set_level(CASS_LOG_ERROR);
+    }
   }
 
   return SUCCESS;
@@ -212,8 +228,11 @@ static PHP_INI_MH(OnUpdateLog)
   if (new_value) {
     if (strcmp(new_value, "syslog") != 0) {
       char realpath[MAXPATHLEN + 1];
-      if (VCWD_REALPATH(new_value, realpath))
+      if (VCWD_REALPATH(new_value, realpath)) {
         log_location = strdup(realpath);
+      } else {
+        log_location = strdup(new_value);
+      }
     } else {
       log_location = strdup(new_value);
     }
@@ -224,8 +243,8 @@ static PHP_INI_MH(OnUpdateLog)
 }
 
 PHP_INI_BEGIN()
-PHP_INI_ENTRY("cassandra.log", PHP_CASSANDRA_DEFAULT_LOG, PHP_INI_ALL, OnUpdateLog)
-PHP_INI_ENTRY("cassandra.log_level", NULL, PHP_INI_ALL, OnUpdateLogLevel)
+PHP_INI_ENTRY("cassandra.log",       PHP_CASSANDRA_DEFAULT_LOG,       PHP_INI_ALL, OnUpdateLog)
+PHP_INI_ENTRY("cassandra.log_level", PHP_CASSANDRA_DEFAULT_LOG_LEVEL, PHP_INI_ALL, OnUpdateLogLevel)
 PHP_INI_END()
 
 static PHP_GINIT_FUNCTION(cassandra)
@@ -353,6 +372,8 @@ PHP_MINFO_FUNCTION(cassandra)
   php_info_print_table_row(2, "Persistent Sessions", buf);
 
   php_info_print_table_end();
+
+  DISPLAY_INI_ENTRIES();
 }
 
 zend_class_entry*

ext/template.rc

@@ -47,7 +47,7 @@ BEGIN
       VALUE "LegalCopyright", "Copyright � 2015 DataStax, Inc."
       VALUE "OriginalFilename", FILE_NAME
       VALUE "ProductName", "Cassandra PHP driver " BUILD_INFORMATION
-      VALUE "ProductVersion", PHP_CASSANDRA_EXTVER
+      VALUE "ProductVersion", PHP_CASSANDRA_VERSION
       VALUE "URL", "http://www.datastax.com"
     END
   END

features/batch_statements.feature

@@ -1,3 +1,4 @@
+@cassandra-version-2.0
 Feature: Batch statements
 
   PHP Driver supports batch statements. There are three types of batch statements:
@@ -18,7 +19,7 @@ Feature: Batch statements
       """cql
       CREATE KEYSPACE simplex WITH replication = {
         'class': 'SimpleStrategy',
-        'replication_factor': 3
+        'replication_factor': 1
       };
       USE simplex;
       CREATE TABLE playlists (