Commit Graph

2237 Commits

Author SHA1 Message Date
Gordon Guthrie
5c61010a99 Reorganised timeseries test suite to be inline
with the other test suites - using a util fn
2015-09-21 11:46:19 +00:00
Andrei Zavada
478d2ef36f eventual fixes to tests/ts_basic 2015-09-21 03:25:14 +04:00
Andrei Zavada
3de42c7964 make timeseries.part compile 2015-09-18 14:02:51 +04:00
Andrei Zavada
7a6bda3e89 Merge branch 'riak_ts' of github.com:basho/riak_test into riak_ts 2015-09-18 13:31:17 +04:00
Andrei Zavada
87aca6bf1a fixes to be squashed to tests/ts_basic 2015-09-18 13:28:35 +04:00
Gordon Guthrie
43fd6024bf rejig of test suites, modularisation 2015-09-18 09:22:03 +00:00
Gordon Guthrie
a362a235a0 Start of the timeseries test suite
The passing test is passing
The failing test is failing (but not in a good way)

This commit shows how we will split out common code in
our riak_tests - things like generators for data, and
configurations to run the tests against

Overkill for the tests herein, but will become more
important for the rest of the tests and the eqc tests
2015-09-16 15:55:08 +00:00
Andrei Zavada
22499615ca fixes to be squashed, still WIP 2015-09-16 16:33:34 +04:00
Andrei Zavada
32bbf19be4 pin riakc to ts-enabled branch of riak-erlang-client 2015-09-16 04:50:07 +04:00
Andrei Zavada
6e0d5b6cd3 basic, untested module for riak_ts
* requires riak-erlang-client/bk-rts-221-timeseries;
* to be run on riak/end-to-end/timeseries;
* UNTESTED.
2015-09-16 01:37:57 +04:00
Brett Hazen
afa57bd12b Merge pull request #864 from mikewallace1979/add-apache-licese-to-intercepts-files
Add copyright and Apache License Version 2.0
2015-09-11 13:07:52 -06:00
Mike Wallace
1f719ab8a5 Add copyright and Apache License Version 2.0 2015-09-11 17:06:34 +01:00
Doug Rohrer
222d559f5b Merge pull request #854 from basho/forward_merge/dr/riak_2.0_to_master
Forward merge/dr/riak 2.0 to master
2015-08-26 14:15:16 -04:00
Doug Rohrer
51db1bde66 Merge branch 'riak/2.0' into forward_merge/dr/riak_2.0_to_master
- Forward merge verify_stage_clustering fix
- Updates to allow either strings or atoms for node names in config & allow them to be different (atom or string) in test vs. config.
2015-08-26 13:59:04 -04:00
Doug Rohrer
ac71741f35 Merge pull request #853 from basho/bugfix/dr/fix_verify_staged_cluster
Use wait_for and actually check the results of `riak-admin cluster join`
2015-08-26 13:53:42 -04:00
Doug Rohrer
9c2db4b148 Use wait_for and actually check the results of riak-admin cluster join
to ensure we've really joined the cluster before we continue the test.
2015-08-26 13:36:30 -04:00
Jason Voegele
b8dfb15d14 Merge pull request #852 from basho/bugfix/verify-snmp-repl-fail-appropriately
Fail by crashing test process instead of returning a tagged tuple
2015-08-26 09:48:32 -04:00
Jason Voegele
b71e582dc0 Log when original version of intercepted function fails 2015-08-26 09:21:30 -04:00
Kazuhiro Suzuki
72d7db2016 Merge pull request #844 from basho/feature/move-cs-harness-to-cs-repo
Move rt_cs_dev to cs repo
2015-08-26 11:07:34 +09:00
Jason Voegele
8641f6edc6 Crash test process instead of returning fail atom 2015-08-25 16:24:55 -04:00
Jason Voegele
9ee856546a Fail with the bare atom fail
`riak_test_runner` does not support tagged tuples for failures. Fix
verify_snmp_repl module so that it returns the bare atom `fail` when it
fails, and write more detailed error messages to the log instead.
2015-08-25 14:39:28 -04:00
Brett Hazen
c00dabd443 Merge pull request #851 from basho/bugfix/bch/devrels-can-be-atoms-or-strings
Allow devrel name in .riak_test.config to be an atom or a string
2015-08-25 12:39:18 -06:00
Brett Hazen
ffadf647ab Allow devrel name in .riak_test.config to be an atom or a string 2015-08-25 10:39:47 -06:00
Brett Hazen
061d9fe663 Merge pull request #849 from basho/bugfix/dr/http_bucket_types_backport
Backport #847 to fix issues with http_bucket_types
2015-08-25 10:25:58 -06:00
Doug Rohrer
a26be146c4 Added rt:create_activate_and_wait_for_bucket_type so that the test can
specify it wants all nodes in the cluster to have the type before
continuing. Update http_bucket_types to use said function.

(cherry picked from commit 31b1002b3e)
2015-08-25 11:21:18 -04:00
Fred Dushin
adbaa99da8 Merge pull request #847 from basho/bugfix/dr/http_bucket_types_should_wait_for_visibility
Added rt:create_activate_and_wait_for_bucket_type
2015-08-25 10:26:57 -04:00
Doug Rohrer
31b1002b3e Added rt:create_activate_and_wait_for_bucket_type so that the test can
specify it wants all nodes in the cluster to have the type before
continuing. Update http_bucket_types to use said function.
2015-08-25 10:20:42 -04:00
Fred Dushin
6d63bd5713 Merge pull request #843 from basho/bugfix/dr/forward_merge_riak667_connection_fix
Forward merge riak667 connection fix to master
2015-08-23 08:49:04 -04:00
Doug Rohrer
bbf44fd14b Forward merge (potential) fix for riak667_mixed {error, disconnected} issue. 2015-08-21 17:14:52 -04:00
Fred Dushin
a12b5475c9 Merge pull request #842 from basho/bugfix/dr/riak667_connection_issues
Create new connections after they crash, rather than depending on auto_reconect
2015-08-21 16:59:59 -04:00
Doug Rohrer
94c66e7138 Renamed connection Pids and reformat some code for consistency. 2015-08-21 16:36:37 -04:00
Doug Rohrer
86fece0c9c Use a new connection after each failed attempt to read a map, as
auto_reconnect seems to be broken, and isn't part of the test.
2015-08-21 11:22:12 -04:00
Brett Hazen
3add98cd83 Merge pull request #841 from basho/bugfix/bch/backport-791-for-riak667
Backport PR #791 to address disconnection in riak667_mixed
2015-08-19 10:35:10 -06:00
Brett Hazen
67cfb444ed Backport @seancribbs's change in #791 to address disconnection in
riak667_mixed
2015-08-19 10:12:23 -06:00
Kazuhiro Suzuki
f6fb08c53a Move rt_cs_dev to cs repo 2015-08-18 06:04:47 +09:00
Zeeshan Lakhani
357e8f497e Merge pull request #838 from basho/merge-forward/zl/riak/2.0_head_97be67233aaac3242a58d06700bf0fbe55619d80-to-2.1
Merge forward/zl/riak/2.0 head 97be67233a to 2.1
2015-08-14 17:50:29 -04:00
Zeeshan Lakhani
d3a17e90da Merge remote-tracking branch 'origin/riak/2.0' into merge-forward/zl/riak/2.0_head_97be67233aaac3242a58d06700bf0fbe55619d80-to-2.1 2015-08-14 17:34:18 -04:00
John Daily
97be67233a Merge pull request #837 from basho/fix/az/ifdef-eqc-for-proxy-overload-recovery
-ifdef(EQC) for proxy_overload_recovery; add missing -behaviour(riak_test)
2015-08-14 17:26:22 -04:00
Andrei Zavada
724d368eda specify -behaviour(riak_test) for proxy_overload_recovery 2015-08-15 01:19:07 +04:00
Andrei Zavada
c259888e56 wrap proxy_overload_recovery contents in -ifdef(EQC). 2015-08-15 01:19:07 +04:00
Brett Hazen
619baaa5fc Merge pull request #834 from basho/backport/bch/add-verify-snmp-repl
Backport verify_snmp_repl
2015-08-14 11:39:52 -06:00
Jason Voegele
c1d21c4822 Backport verify_snmp_repl 2015-08-14 10:26:01 -06:00
Jon Meredith
9db55b5256 Merge branch 'riak/2.0' 2015-08-14 08:15:06 -06:00
Jon Meredith
4a5d42c283 Merge pull request #833 from basho/merge-forward/zl/riak/2.0tomaster
Merge forward/zl/riak/2.0tomaster
2015-08-13 17:06:06 -06:00
Christopher S. Meiklejohn
caac0f35c1 Merge pull request #827 from basho/bugfix/jdm/vnode-proxy-stuck-in-overload-v2
Quickcheck test for vnode proxy overload recovery.
2015-08-13 18:58:36 -04:00
Zeeshan Lakhani
4b9c91bfbe Merge remote-tracking branch 'origin/riak/2.0' into merge-forward/zl/riak/2.0tomaster 2015-08-13 18:36:12 -04:00
Jon Meredith
2e868da4ca Merge pull request #829 from basho/jdm/2.1.2rc2-that-should-be-in-2.0
Jdm/2.1.2rc2 that should be in 2.0
2015-08-13 16:26:54 -06:00
Jon Meredith
0dc520a346 Merge pull request #830 from basho/bugfix/bch/riak-control-amended
Fix riak_control to check the correct devrel version
2015-08-13 16:26:35 -06:00
John Daily
fd9c553454 Merge pull request #832 from basho/bugfix/jrd/deterministic-join-failure
Make this test deterministic whether it likes it or not: intercept init
2015-08-13 17:36:36 -04:00
John R. Daily
2ce3a57b1b Make this test deterministic whether it likes it or not: intercept init 2015-08-13 17:33:38 -04:00